Merge tag 'v3.13-rc6' into for-3.14/core
authorJens Axboe <axboe@kernel.dk>
Tue, 31 Dec 2013 16:51:02 +0000 (09:51 -0700)
committerJens Axboe <axboe@kernel.dk>
Tue, 31 Dec 2013 16:51:02 +0000 (09:51 -0700)
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


Trivial merge