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
..
bcache	Linux 3.13-rc6	2013-12-31 09:51:02 -07:00
persistent-data	dm array: fix a reference counting bug in shadow_ablock	2013-12-13 14:22:10 -05:00
bitmap.c	sysfs: clean up sysfs_get_dirent()	2013-09-26 15:33:18 -07:00
bitmap.h
dm-bio-prison.c
dm-bio-prison.h
dm-bio-record.h	dm: Refactor for new bio cloning/splitting	2013-11-23 22:33:55 -08:00
dm-bufio.c	Linux 3.13-rc6	2013-12-31 09:51:02 -07:00
dm-bufio.h
dm-cache-block-types.h
dm-cache-metadata.c	dm cache metadata: check the metadata version when reading the superblock	2013-11-11 11:37:49 -05:00
dm-cache-metadata.h	dm cache: add passthrough mode	2013-11-11 11:37:49 -05:00
dm-cache-policy-cleaner.c
dm-cache-policy-internal.h	dm cache: add remove_cblock method to policy interface	2013-11-11 11:37:50 -05:00
dm-cache-policy-mq.c	Linux 3.13-rc6	2013-12-31 09:51:02 -07:00
dm-cache-policy.c	dm cache: return -EINVAL if the user specifies unknown cache policy	2013-11-09 18:20:18 -05:00
dm-cache-policy.h	dm cache: add remove_cblock method to policy interface	2013-11-11 11:37:50 -05:00
dm-cache-target.c	Linux 3.13-rc6	2013-12-31 09:51:02 -07:00
dm-crypt.c	block: Convert drivers to immutable biovecs	2013-11-23 22:33:51 -08:00
dm-delay.c	Linux 3.13-rc6	2013-12-31 09:51:02 -07:00
dm-exception-store.c
dm-exception-store.h
dm-flakey.c	block: Abstract out bvec iterator	2013-11-23 22:33:47 -08:00
dm-io.c	block: Convert drivers to immutable biovecs	2013-11-23 22:33:51 -08:00
dm-ioctl.c	dm: allow remove to be deferred	2013-11-09 18:20:22 -05:00
dm-kcopyd.c	dm: stop using WQ_NON_REENTRANT	2013-08-23 09:02:13 -04:00
dm-linear.c	block: Abstract out bvec iterator	2013-11-23 22:33:47 -08:00
dm-log-userspace-base.c
dm-log-userspace-transfer.c
dm-log-userspace-transfer.h
dm-log.c
dm-mpath.c	dm mpath: requeue I/O during pg_init	2013-11-05 11:20:34 -05:00
dm-mpath.h
dm-path-selector.c
dm-path-selector.h
dm-queue-length.c
dm-raid1.c	block: Convert drivers to immutable biovecs	2013-11-23 22:33:51 -08:00
dm-raid.c
dm-region-hash.c	block: Abstract out bvec iterator	2013-11-23 22:33:47 -08:00
dm-round-robin.c
dm-service-time.c
dm-snap-persistent.c	dm snapshot: fix data corruption	2013-10-16 03:17:47 +01:00
dm-snap-transient.c
dm-snap.c	Linux 3.13-rc6	2013-12-31 09:51:02 -07:00
dm-stats.c	dm stats: initialize read-only module parameter	2013-12-10 19:13:21 -05:00
dm-stats.h	dm: add statistics support	2013-09-05 20:46:06 -04:00
dm-stripe.c	block: Abstract out bvec iterator	2013-11-23 22:33:47 -08:00
dm-switch.c	block: Abstract out bvec iterator	2013-11-23 22:33:47 -08:00
dm-sysfs.c
dm-table.c	dm table: fail dm_table_create on dm_round_up overflow	2013-12-10 16:34:27 -05:00
dm-target.c	dm: allow error target to replace bio-based and request-based targets	2013-09-05 20:46:05 -04:00
dm-thin-metadata.c	dm thin: allow pool in read-only mode to transition to read-write mode	2013-12-10 16:35:13 -05:00
dm-thin-metadata.h	dm thin: allow pool in read-only mode to transition to read-write mode	2013-12-10 16:35:13 -05:00
dm-thin.c	Linux 3.13-rc6	2013-12-31 09:51:02 -07:00
dm-uevent.c
dm-uevent.h
dm-verity.c	block: Generic bio chaining	2013-11-23 22:33:56 -08:00
dm-zero.c
dm.c	dm: Refactor for new bio cloning/splitting	2013-11-23 22:33:55 -08:00
dm.h	dm: allow remove to be deferred	2013-11-09 18:20:22 -05:00
faulty.c	block: Abstract out bvec iterator	2013-11-23 22:33:47 -08:00
Kconfig	dm: fix Kconfig menu indentation	2013-11-09 18:20:22 -05:00
linear.c	block: Introduce new bio_split()	2013-11-23 22:33:57 -08:00
linear.h
Makefile	dm: add statistics support	2013-09-05 20:46:06 -04:00
md.c	Linux 3.13-rc6	2013-12-31 09:51:02 -07:00
md.h	Merge branch 'for-3.13/core' of git://git.kernel.dk/linux-block	2013-11-14 12:08:14 +09:00
multipath.c	block: Abstract out bvec iterator	2013-11-23 22:33:47 -08:00
multipath.h
raid0.c	block: Introduce new bio_split()	2013-11-23 22:33:57 -08:00
raid0.h
raid1.c	block: Abstract out bvec iterator	2013-11-23 22:33:47 -08:00
raid1.h	raid1: Rewrite the implementation of iobarrier.	2013-11-19 15:19:18 +11:00
raid5.c	Linux 3.13-rc6	2013-12-31 09:51:02 -07:00
raid5.h	md update for 3.13.	2013-11-20 13:05:25 -08:00
raid10.c	block: Introduce new bio_split()	2013-11-23 22:33:57 -08:00
raid10.h