]> www.infradead.org Git - users/hch/block.git/commitdiff
Merge branch 'for-5.15/drivers' into for-next
authorJens Axboe <axboe@kernel.dk>
Mon, 23 Aug 2021 19:47:12 +0000 (13:47 -0600)
committerJens Axboe <axboe@kernel.dk>
Mon, 23 Aug 2021 19:47:12 +0000 (13:47 -0600)
* for-5.15/drivers: (33 commits)
  nvme: remove the unused NVME_NS_* enum
  nvme: remove nvm_ndev from ns
  nvme: Have NVME_FABRICS select NVME_CORE instead of transport drivers
  block: nbd: add sanity check for first_minor
  nvmet: check that host sqsize does not exceed ctrl MQES
  nvmet: avoid duplicate qid in connect cmd
  nvmet: pass back cntlid on successful completion
  nvme-rdma: don't update queue count when failing to set io queues
  nvme-tcp: don't update queue count when failing to set io queues
  nvme-tcp: pair send_mutex init with destroy
  nvme: allow user toggling hmb usage
  nvme-pci: disable hmb on idle suspend
  nvmet: remove redundant assignments of variable status
  nvmet: add set feature tracing support
  nvme: add set feature tracing support
  nvme-fabrics: remove superfluous nvmf_host_put in nvmf_parse_options
  nvme-pci: cmb sysfs: one file, one value
  nvme-pci: use attribute group for cmb sysfs
  nvme: code command_id with a genctr for use-after-free validation
  nvme-tcp: don't check blk_mq_tag_to_rq when receiving pdu data
  ...

Signed-off-by: Jens Axboe <axboe@kernel.dk>
1  2 
MAINTAINERS
drivers/block/nbd.c
drivers/nvme/host/core.c

diff --cc MAINTAINERS
Simple merge
Simple merge
index 68acd33c38561c4bd17e875f05d60d8b632dcd93,b9a46c54f714e7eaca69f79fb912b40c7daf6541..8679a108f571ee8170219d906535b244f145896e
@@@ -3758,17 -3757,11 +3753,10 @@@ static void nvme_alloc_ns(struct nvme_c
        if (!nvme_mpath_set_disk_name(ns, disk->disk_name, &disk->flags))
                sprintf(disk->disk_name, "nvme%dn%d", ctrl->instance,
                        ns->head->instance);
 -      ns->disk = disk;
  
        if (nvme_update_ns_info(ns, id))
 -              goto out_put_disk;
 +              goto out_unlink_ns;
  
-       if ((ctrl->quirks & NVME_QUIRK_LIGHTNVM) && id->vs[0] == 0x1) {
-               if (nvme_nvm_register(ns, disk->disk_name, node)) {
-                       dev_warn(ctrl->device, "LightNVM init failure\n");
-                       goto out_unlink_ns;
-               }
-       }
        down_write(&ctrl->namespaces_rwsem);
        list_add_tail(&ns->list, &ctrl->namespaces);
        up_write(&ctrl->namespaces_rwsem);