Comment 25 for bug 1659111

------- Comment on attachment From <email address hidden> 2017-04-06 14:11 EDT-------

I'm not sure I understood the question. All of the patches are backports.
These are the files that had conflicts:

block/blk-cgroup.c
block/blk-core.c
block/blk-settings.c
block/blk-sysfs.c
block/blk-wbt.c
block/compat_ioctl.c
block/ioctl.c
drivers/block/aoe/aoeblk.c
drivers/block/drbd/drbd_nl.c
drivers/md/dm.c
drivers/md/md.c
fs/block_dev.c
fs/btrfs/volumes.c
include/linux/backing-dev-defs.h
include/linux/blkdev.h

I'm also attaching a new mbox file with exactly the same patches, with the only difference being that the description of each patch mentions which files had conflicts when cherry-picking.