Merge branch 'master' into for-4.12/post-merge
authorJens Axboe <axboe@fb.com>
Tue, 25 Apr 2017 04:03:14 +0000 (22:03 -0600)
committerJens Axboe <axboe@fb.com>
Tue, 25 Apr 2017 04:03:14 +0000 (22:03 -0600)
commitd9fd363a6cbfae24ffaa00ac6fd3ce8e271acaf1
tree9139831824ebe9cf77d1bf836b558ee2061c0483
parenta44f53faf4674d84cba79f7ee574584e18ab8744
parent8f9cedc76fc7d9bc916127f8fe1287a249891d40
Merge branch 'master' into for-4.12/post-merge
24 files changed:
block/blk-mq.c
block/elevator.c
drivers/block/mtip32xx/mtip32xx.c
drivers/block/zram/zram_drv.c
drivers/md/dm-raid.c
drivers/nvme/host/core.c
drivers/nvme/host/fc.c
drivers/nvme/host/nvme.h
drivers/nvme/host/pci.c
drivers/nvme/host/rdma.c
drivers/nvme/target/loop.c
drivers/scsi/lpfc/lpfc_nvmet.c
drivers/scsi/scsi_lib.c
drivers/scsi/sd.c
drivers/scsi/sg.c
drivers/target/iscsi/iscsi_target_configfs.c
fs/btrfs/ctree.h
fs/btrfs/disk-io.c
fs/btrfs/super.c
fs/cifs/cifsfs.c
fs/cifs/connect.c
fs/dax.c
fs/xfs/xfs_bmap_util.c
include/linux/blkdev.h