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

20 files changed:
1  2 
block/blk-mq.c
drivers/block/xen-blkfront.c
drivers/md/bcache/bcache.h
drivers/md/bcache/btree.c
drivers/md/bcache/movinggc.c
drivers/md/bcache/super.c
drivers/md/bcache/util.c
drivers/md/bcache/writeback.c
drivers/md/dm-bufio.c
drivers/md/dm-cache-policy-mq.c
drivers/md/dm-cache-target.c
drivers/md/dm-delay.c
drivers/md/dm-snap.c
drivers/md/dm-thin.c
drivers/md/md.c
drivers/md/raid5.c
drivers/s390/block/dasd_eckd.c
drivers/scsi/sd.c
drivers/staging/zram/zram_drv.c
fs/xfs/xfs_buf.c

diff --cc block/blk-mq.c
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc drivers/md/md.c
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge