Merge branch 'for-6.1/block' into for-6.1/passthrough

* for-6.1/block: (162 commits)
  sbitmap: fix lockup while swapping
  block: add rationale for not using blk_mq_plug() when applicable
  block: adapt blk_mq_plug() to not plug for writes that require a zone lock
  s390/dasd: use blk_mq_alloc_disk
  blk-cgroup: don't update the blkg lookup hint in blkg_conf_prep
  nvmet: don't look at the request_queue in nvmet_bdev_set_limits
  nvmet: don't look at the request_queue in nvmet_bdev_zone_mgmt_emulate_all
  blk-mq: use quiesced elevator switch when reinitializing queues
  block: replace blk_queue_nowait with bdev_nowait
  nvme: remove nvme_ctrl_init_connect_q
  nvme-loop: use the tagset alloc/free helpers
  nvme-loop: store the generic nvme_ctrl in set->driver_data
  nvme-loop: initialize sqsize later
  nvme-fc: use the tagset alloc/free helpers
  nvme-fc: store the generic nvme_ctrl in set->driver_data
  nvme-fc: keep ctrl->sqsize in sync with opts->queue_size
  nvme-rdma: use the tagset alloc/free helpers
  nvme-rdma: store the generic nvme_ctrl in set->driver_data
  nvme-tcp: use the tagset alloc/free helpers
  nvme-tcp: store the generic nvme_ctrl in set->driver_data
  ...

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

diff --cc MAINTAINERS
Simple merge

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

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

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

diff --cc block/genhd.c
index 988ba52fd33166d056bdbea9845232a45c5df03d,d6a21803a57e2bb563f4047a456f555bd0caada9..514395361d7c588b5b4f6b7a8dba744cf2e467d0
--- 1/block/genhd.c
--- 2/block/genhd.c
+++ b/block/genhd.c
@@@ -625,9 -626,7 +625,9 @@@ void del_gendisk(struct gendisk *disk
        pm_runtime_set_memalloc_noio(disk_to_dev(disk), false);
        device_del(disk_to_dev(disk));
  
-       blk_throtl_cancel_bios(disk->queue);
 +      blk_mq_freeze_queue_wait(q);
 +
+       blk_throtl_cancel_bios(disk);
  
        blk_sync_queue(q);
        blk_flush_integrity();

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

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

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

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

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

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

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

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

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

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

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

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

diff --cc drivers/ufs/core/ufshcd.c
Simple merge

diff --cc include/scsi/scsi_host.h
Simple merge

diff --cc io_uring/io_uring.c
Simple merge

diff --cc kernel/sched/psi.c
Simple merge