linux_dsm_epyc7002/drivers/s390/block
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
..
dasd_3990_erp.c s390/time: rename tod clock access functions 2013-02-14 15:55:10 +01:00
dasd_alias.c s390/time: rename tod clock access functions 2013-02-14 15:55:10 +01:00
dasd_devmap.c s390: replace strict_strtoul() with kstrtoul() 2013-08-22 12:20:00 +02:00
dasd_diag.c block: Convert bio_for_each_segment() to bvec_iter 2013-11-23 22:33:49 -08:00
dasd_diag.h s390/comments: unify copyright messages and remove file names 2012-07-20 11:15:04 +02:00
dasd_eckd.c Linux 3.13-rc6 2013-12-31 09:51:02 -07:00
dasd_eckd.h s390/comments: unify copyright messages and remove file names 2012-07-20 11:15:04 +02:00
dasd_eer.c s390/time: rename tod clock access functions 2013-02-14 15:55:10 +01:00
dasd_erp.c s390/dasd: fix statistics for recovered requests 2013-08-28 09:19:34 +02:00
dasd_fba.c block: Convert bio_for_each_segment() to bvec_iter 2013-11-23 22:33:49 -08:00
dasd_fba.h s390/comments: unify copyright messages and remove file names 2012-07-20 11:15:04 +02:00
dasd_genhd.c s390/dasd: fix memory leak caused by dangling references to request_queue 2013-12-02 15:31:06 +01:00
dasd_int.h s390/dasd: Fail all requests when DASD_FLAG_ABORTIO is set 2013-07-01 17:31:26 +02:00
dasd_ioctl.c s390/dasd: Fail all requests when DASD_FLAG_ABORTIO is set 2013-07-01 17:31:26 +02:00
dasd_proc.c s390/comments: unify copyright messages and remove file names 2012-07-20 11:15:04 +02:00
dasd.c Merge branch 'for-3.13/drivers' of git://git.kernel.dk/linux-block 2013-11-14 12:13:05 +09:00
dcssblk.c block: Convert bio_for_each_segment() to bvec_iter 2013-11-23 22:33:49 -08:00
Kconfig s390/scm_block: force cluster writes 2012-09-26 15:45:01 +02:00
Makefile s390/scm_block: force cluster writes 2012-09-26 15:45:01 +02:00
scm_blk_cluster.c block: Convert bio_for_each_segment() to bvec_iter 2013-11-23 22:33:49 -08:00
scm_blk.c block: Convert bio_for_each_segment() to bvec_iter 2013-11-23 22:33:49 -08:00
scm_blk.h s390/s390dbf: use debug_level_enabled() where applicable 2013-10-24 17:16:54 +02:00
scm_drv.c s390/scm_block: fix printk format string 2013-03-21 13:35:37 +01:00
xpram.c block: Convert bio_for_each_segment() to bvec_iter 2013-11-23 22:33:49 -08:00