Jens Axboe b28bc9b38c Merge tag 'v3.13-rc6' into for-3.14/core ...

Needed to bring blk-mq uptodate, since changes have been going in
since for-3.14/core was established.

Fixup merge issues related to the immutable biovec changes.

Signed-off-by: Jens Axboe <axboe@kernel.dk>

Conflicts:
	block/blk-flush.c
	fs/btrfs/check-integrity.c
	fs/btrfs/extent_io.c
	fs/btrfs/scrub.c
	fs/logfs/dev_bdev.c

2013-12-31 09:51:02 -07:00

..

iscsi

iscsi-target: Fix incorrect np->np_thread NULL assignment

2013-12-19 00:18:25 -08:00

loopback

tcm_loop: Implement target reset

2013-10-16 15:42:52 -07:00

sbp

target: Remove TF_CIT_TMPL macro

2013-10-16 13:35:02 -07:00

tcm_fc

target: Remove TF_CIT_TMPL macro

2013-10-16 13:35:02 -07:00

Kconfig

sbp-target: Initial merge of firewire/ieee-1394 target mode support

2012-05-09 15:25:17 -07:00

Makefile

target: Add support for EXTENDED_COPY copy offload emulation

2013-09-10 16:48:43 -07:00

target_core_alua.c

target_core_alua: Store supported ALUA states

2013-11-20 11:26:37 -08:00

target_core_alua.h

target_core_alua: Store supported ALUA states

2013-11-20 11:26:37 -08:00

target_core_configfs.c

target_core_configfs: split up ALUA supported states

2013-11-20 11:38:18 -08:00

target_core_device.c

target/file: Update hw_max_sectors based on current block_size

2013-12-19 00:18:54 -08:00

target_core_fabric_configfs.c

target: Remove TF_CIT_TMPL macro

2013-10-16 13:35:02 -07:00

target_core_fabric_lib.c

target: Update copyright ownership/year information to 2013

2013-09-10 20:23:36 -07:00

target_core_file.c

target/file: Update hw_max_sectors based on current block_size

2013-12-19 00:18:54 -08:00

target_core_file.h

target/file: Update hw_max_sectors based on current block_size

2013-12-19 00:18:54 -08:00

target_core_hba.c

target: Update copyright ownership/year information to 2013

2013-09-10 20:23:36 -07:00

target_core_iblock.c

block: Abstract out bvec iterator

2013-11-23 22:33:47 -08:00

target_core_iblock.h

target: kill struct se_subsystem_dev

2012-11-06 20:55:43 -08:00

target_core_internal.h

target: Add percpu refcounting for se_lun access

2013-11-07 14:24:52 -08:00

target_core_pr.c

target core: rename (ex,im)plict -> (ex,im)plicit

2013-11-20 11:24:40 -08:00

target_core_pr.h

target: Alter core_pr_dump_initiator_port for ease of use

2013-06-14 00:04:31 -07:00

target_core_pscsi.c

target/pscsi: fix return value check

2013-10-25 10:42:09 -07:00

target_core_pscsi.h

target: kill struct se_subsystem_dev

2012-11-06 20:55:43 -08:00

target_core_rd.c

target: Core does not need blkdev.h

2013-11-12 13:45:24 -08:00

target_core_rd.h

target/rd: Add ramdisk bit for NULLIO operation

2013-05-11 16:22:39 -07:00

target_core_sbc.c

Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending

2013-11-22 10:52:03 -08:00

target_core_spc.c

target core: rename (ex,im)plict -> (ex,im)plicit

2013-11-20 11:24:40 -08:00

target_core_stat.c

target: Convert se_device statistics to atomic_long_t

2013-11-13 18:34:55 -08:00

target_core_tmr.c

target: Convert se_device statistics to atomic_long_t

2013-11-13 18:34:55 -08:00

target_core_tpg.c

target: Remove extra percpu_ref_init

2013-12-19 14:49:54 -08:00

target_core_transport.c

Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending

2013-11-22 10:52:03 -08:00

target_core_ua.c

target: Update copyright ownership/year information to 2013

2013-09-10 20:23:36 -07:00

target_core_ua.h

target core: rename (ex,im)plict -> (ex,im)plicit

2013-11-20 11:24:40 -08:00

target_core_xcopy.c

Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending

2013-11-22 10:52:03 -08:00

target_core_xcopy.h

target: Add support for EXTENDED_COPY copy offload emulation

2013-09-10 16:48:43 -07:00