Merge branch 'for-4.17/block' into for-4.17/merged

* for-4.17/block: (139 commits)
  blk-mq: Directly schedule q->timeout_work when aborting a request
  blktrace: fix comment in blktrace_api.h
  lightnvm: remove function name in strings
  lightnvm: pblk: remove some unnecessary NULL checks
  lightnvm: pblk: don't recover unwritten lines
  lightnvm: pblk: implement 2.0 support
  lightnvm: pblk: implement get log report chunk
  lightnvm: pblk: rename ppaf* to addrf*
  lightnvm: pblk: check for supported version
  lightnvm: implement get log report chunk helpers
  lightnvm: make address conversions depend on generic device
  lightnvm: add support for 2.0 address format
  lightnvm: normalize geometry nomenclature
  lightnvm: complete geo structure with maxoc*
  lightnvm: add shorten OCSSD version in geo
  lightnvm: add minor version to generic geometry
  lightnvm: simplify geometry structure
  lightnvm: pblk: refactor init/exit sequences
  lightnvm: Avoid validation of default op value
  lightnvm: centralize permission check for lightnvm ioctl
  ...

Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --cc MAINTAINERS
Simple merge

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

diff --cc block/sed-opal.c
Simple merge

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

diff --cc drivers/block/xen-blkfront.c
Simple merge

diff --cc drivers/md/bcache/super.c
Simple merge

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

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

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

diff --cc drivers/md/raid1.c
Simple merge

diff --cc drivers/md/raid10.c
Simple merge

diff --cc drivers/md/raid5.c
Simple merge

diff --cc drivers/mmc/core/block.c
Simple merge

diff --cc drivers/nvdimm/blk.c
Simple merge

diff --cc drivers/nvdimm/btt.c
index 4b95ac513de2131e480445bae0f7b6b319b5bf7f,6f311f88a8e8f9a59d829e3d473880a8d23b667b..85de8053aa344510a9f071db342404a424c16c73
--- 1/drivers/nvdimm/btt.c
--- 2/drivers/nvdimm/btt.c
+++ b/drivers/nvdimm/btt.c
@@@ -1542,9 -1542,11 +1542,9 @@@ static int btt_blk_init(struct btt *btt
        blk_queue_make_request(btt->btt_queue, btt_make_request);
        blk_queue_logical_block_size(btt->btt_queue, btt->sector_size);
        blk_queue_max_hw_sectors(btt->btt_queue, UINT_MAX);
-       queue_flag_set_unlocked(QUEUE_FLAG_NONROT, btt->btt_queue);
+       blk_queue_flag_set(QUEUE_FLAG_NONROT, btt->btt_queue);
        btt->btt_queue->queuedata = btt;
  
 -      set_capacity(btt->btt_disk, 0);
 -      device_add_disk(&btt->nd_btt->dev, btt->btt_disk);
        if (btt_meta_size(btt)) {
                int rc = nd_integrity_init(btt->btt_disk, btt_meta_size(btt));
  

diff --cc drivers/nvdimm/pmem.c
Simple merge

diff --cc drivers/nvme/host/core.c
index 7aeca5db791613f345f733513f2558d4de14e2ae,f81e3b323366391662b28857134934fbbd85d0f9..197a6ba9700fbe6a232af502f739a85856f755e6
--- 1/drivers/nvme/host/core.c
--- 2/drivers/nvme/host/core.c
+++ b/drivers/nvme/host/core.c
@@@ -3033,6 -3052,8 +3052,7 @@@ static void nvme_alloc_ns(struct nvme_c
                        ns->disk->disk_name);
  
        nvme_mpath_add_disk(ns->head);
 -      nvme_mpath_add_disk_links(ns);
+       nvme_fault_inject_init(ns);
        return;
   out_unlink_ns:
        mutex_lock(&ctrl->subsys->lock);
@@@ -3051,7 -3072,9 +3071,8 @@@ static void nvme_ns_remove(struct nvme_
        if (test_and_set_bit(NVME_NS_REMOVING, &ns->flags))
                return;
  
+       nvme_fault_inject_fini(ns);
        if (ns->disk && ns->disk->flags & GENHD_FL_UP) {
 -              nvme_mpath_remove_disk_links(ns);
                sysfs_remove_group(&disk_to_dev(ns->disk)->kobj,
                                        &nvme_ns_id_attr_group);
                if (ns->ndev)

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

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

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

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

diff --cc drivers/s390/block/dasd.c
Simple merge

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

diff --cc drivers/scsi/megaraid/megaraid_sas_base.c
Simple merge

diff --cc drivers/scsi/megaraid/megaraid_sas_fusion.c
Simple merge

diff --cc drivers/scsi/mpt3sas/mpt3sas_scsih.c
Simple merge

diff --cc drivers/scsi/qla2xxx/qla_os.c
Simple merge

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

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

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