Merge branch 'master' into for-4.12/post-merge

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

diff --cc block/elevator.c
Simple merge

diff --cc drivers/block/mtip32xx/mtip32xx.c
Simple merge

diff --cc drivers/block/zram/zram_drv.c
Simple merge

diff --cc drivers/md/dm-raid.c
Simple merge

diff --cc drivers/nvme/host/core.c
Simple merge

diff --cc drivers/nvme/host/fc.c
Simple merge

diff --cc drivers/nvme/host/nvme.h
Simple merge

diff --cc drivers/nvme/host/pci.c
Simple merge

diff --cc drivers/nvme/host/rdma.c
Simple merge

diff --cc drivers/nvme/target/loop.c
Simple merge

diff --cc drivers/scsi/lpfc/lpfc_nvmet.c
Simple merge

diff --cc drivers/scsi/scsi_lib.c
Simple merge

diff --cc drivers/scsi/sd.c
Simple merge

diff --cc drivers/scsi/sg.c
Simple merge

diff --cc drivers/target/iscsi/iscsi_target_configfs.c
Simple merge

diff --cc fs/btrfs/ctree.h
Simple merge

diff --cc fs/btrfs/disk-io.c
Simple merge

diff --cc fs/btrfs/super.c
Simple merge

diff --cc fs/cifs/cifsfs.c
Simple merge

diff --cc fs/cifs/connect.c
Simple merge

diff --cc fs/dax.c
Simple merge

diff --cc fs/xfs/xfs_bmap_util.c
Simple merge

diff --cc include/linux/blkdev.h
Simple merge