Jens Axboe
b28bc9b38c
Linux 3.13-rc6
...
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1
iQEcBAABAgAGBQJSwLfoAAoJEHm+PkMAQRiGi6QH/1U1B7lmHChDTw3jj1lfm9gA
189Si4QJlnxFWCKHvKEL+pcaVuACU+aMGI8+KyMYK4/JfuWVjjj5fr/SvyHH2/8m
LdSK8aHMhJ46uBS4WJ/l6v46qQa5e2vn8RKSBAyKm/h4vpt+hd6zJdoFrFai4th7
k/TAwOAEHI5uzexUChwLlUBRTvbq4U8QUvDu+DeifC8cT63CGaaJ4qVzjOZrx1an
eP6UXZrKDASZs7RU950i7xnFVDQu4PsjlZi25udsbeiKcZJgPqGgXz5ULf8ZH8RQ
YCi1JOnTJRGGjyIOyLj7pyB01h7XiSM2+eMQ0S7g54F2s7gCJ58c2UwQX45vRWU=
=/4/R
-----END PGP SIGNATURE-----
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
Makefile
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_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_core_pscsi.c
target/pscsi: fix return value check
2013-10-25 10:42:09 -07:00
target_core_pscsi.h
target_core_rd.c
target: Core does not need blkdev.h
2013-11-12 13:45:24 -08:00
target_core_rd.h
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