From: Jens Axboe <axboe@kernel.dk>
Date: Tue, 31 Dec 2013 16:51:02 +0000 (-0700)
Subject: Merge tag 'v3.13-rc6' into for-3.14/core
X-Git-Tag: v3.14-rc1~43^2~15
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=b28bc9b38c52f63f43e3fd875af982f2240a2859;p=linux.git

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
---

b28bc9b38c52f63f43e3fd875af982f2240a2859