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
..
alloc.c	bcache: bugfix - moving_gc now moves only correct buckets	2013-12-16 14:22:58 -08:00
bcache.h	Linux 3.13-rc6	2013-12-31 09:51:02 -07:00
bset.c	bcache: Delete some slower inline asm	2013-11-10 21:56:42 -08:00
bset.h	bcache: Kill bch_next_recurse_key()	2013-11-10 21:56:39 -08:00
btree.c	Linux 3.13-rc6	2013-12-31 09:51:02 -07:00
btree.h	bcache: Avoid deadlocking in garbage collection	2013-11-10 21:56:38 -08:00
closure.c	bcache: Drop some closure stuff	2013-11-10 21:56:10 -08:00
closure.h	bcache: Drop some closure stuff	2013-11-10 21:56:10 -08:00
debug.c	block: Convert bio_for_each_segment() to bvec_iter	2013-11-23 22:33:49 -08:00
debug.h	bcache: Bypass torture test	2013-11-10 21:56:43 -08:00
io.c	block: Introduce new bio_split()	2013-11-23 22:33:57 -08:00
journal.c	block: Abstract out bvec iterator	2013-11-23 22:33:47 -08:00
journal.h	bcache: Pull on disk data structures out into a separate header	2013-11-10 21:56:33 -08:00
Kconfig	bcache: Debug code improvements	2013-11-10 21:56:34 -08:00
Makefile	bcache: A block layer cache	2013-03-23 16:11:31 -07:00
movinggc.c	Linux 3.13-rc6	2013-12-31 09:51:02 -07:00
request.c	block: Introduce new bio_split()	2013-11-23 22:33:57 -08:00
request.h	bcache: Move sector allocator to alloc.c	2013-11-10 21:56:32 -08:00
stats.c	bcache: Break up struct search	2013-11-10 21:56:32 -08:00
stats.h	bcache: Break up struct search	2013-11-10 21:56:32 -08:00
super.c	Linux 3.13-rc6	2013-12-31 09:51:02 -07:00
sysfs.c	bcache: New writeback PD controller	2013-12-16 14:22:59 -08:00
sysfs.h	bcache: Don't export utility code, prefix with bch_	2013-03-28 12:50:55 -06:00
trace.c	bcache: Break up struct search	2013-11-10 21:56:32 -08:00
util.c	Linux 3.13-rc6	2013-12-31 09:51:02 -07:00
util.h	bcache: Fix heap_peek() macro	2013-12-16 14:22:57 -08:00
writeback.c	Linux 3.13-rc6	2013-12-31 09:51:02 -07:00
writeback.h	block: Abstract out bvec iterator	2013-11-23 22:33:47 -08:00