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)
24 files changed:
1  2 
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

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
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc fs/dax.c
Simple merge
Simple merge
Simple merge