Merge tag 'v4.12-rc5' into for-4.13/block
authorJens Axboe <axboe@kernel.dk>
Mon, 12 Jun 2017 14:30:13 +0000 (08:30 -0600)
committerJens Axboe <axboe@kernel.dk>
Mon, 12 Jun 2017 14:30:13 +0000 (08:30 -0600)
commit8f66439eec46d652255b9351abebb540ee5b2fd9
tree94f4a41dc343cf769cd92f1f7711e9ce8ad43728
parent22ec656bcc3f38207ad5476ebad1e5005fb0f1ff
parent32c1431eea4881a6b17bd7c639315010aeefa452
Merge tag 'v4.12-rc5' into for-4.13/block

We've already got a few conflicts and upcoming work depends on some of the
changes that have gone into mainline as regression fixes for this series.

Pull in 4.12-rc5 to resolve these conflicts and make it easier on down stream
trees to continue working on 4.13 changes.

Signed-off-by: Jens Axboe <axboe@kernel.dk>
27 files changed:
block/bio-integrity.c
block/blk-core.c
block/blk-mq.c
block/cfq-iosched.c
drivers/block/loop.c
drivers/block/nbd.c
drivers/block/rbd.c
drivers/md/dm-bufio.c
drivers/md/dm-integrity.c
drivers/md/dm-raid1.c
drivers/md/dm-verity-target.c
drivers/md/dm.c
drivers/md/md.c
drivers/md/raid1.c
drivers/md/raid10.c
drivers/md/raid5-cache.c
drivers/md/raid5-ppl.c
drivers/md/raid5.c
drivers/nvme/host/core.c
drivers/nvme/host/fc.c
drivers/nvme/host/pci.c
drivers/nvme/host/rdma.c
fs/btrfs/ctree.h
fs/btrfs/disk-io.c
fs/btrfs/extent_io.c
fs/btrfs/inode.c
fs/xfs/xfs_buf.c