Merge tag 'for-6.1/block-2022-10-03' of git://git.kernel.dk/linux

Pull block updates from Jens Axboe:

 - NVMe pull requests via Christoph:
      - handle number of queue changes in the TCP and RDMA drivers
        (Daniel Wagner)
      - allow changing the number of queues in nvmet (Daniel Wagner)
      - also consider host_iface when checking ip options (Daniel
        Wagner)
      - don't map pages which can't come from HIGHMEM (Fabio M. De
        Francesco)
      - avoid unnecessary flush bios in nvmet (Guixin Liu)
      - shrink and better pack the nvme_iod structure (Keith Busch)
      - add comment for unaligned "fake" nqn (Linjun Bao)
      - print actual source IP address through sysfs "address" attr
        (Martin Belanger)
      - various cleanups (Jackie Liu, Wolfram Sang, Genjian Zhang)
      - handle effects after freeing the request (Keith Busch)
      - copy firmware_rev on each init (Keith Busch)
      - restrict management ioctls to admin (Keith Busch)
      - ensure subsystem reset is single threaded (Keith Busch)
      - report the actual number of tagset maps in nvme-pci (Keith
        Busch)
      - small fabrics authentication fixups (Christoph Hellwig)
      - add common code for tagset allocation and freeing (Christoph
        Hellwig)
      - stop using the request_queue in nvmet (Christoph Hellwig)
      - set min_align_mask before calculating max_hw_sectors (Rishabh
        Bhatnagar)
      - send a rediscover uevent when a persistent discovery controller
        reconnects (Sagi Grimberg)
      - misc nvmet-tcp fixes (Varun Prakash, zhenwei pi)

 - MD pull request via Song:
      - Various raid5 fix and clean up, by Logan Gunthorpe and David
        Sloan.
      - Raid10 performance optimization, by Yu Kuai.

 - sbitmap wakeup hang fixes (Hugh, Keith, Jan, Yu)

 - IO scheduler switching quisce fix (Keith)

 - s390/dasd block driver updates (Stefan)

 - support for recovery for the ublk driver (ZiyangZhang)

 - rnbd drivers fixes and updates (Guoqing, Santosh, ye, Christoph)

 - blk-mq and null_blk map fixes (Bart)

 - various bcache fixes (Coly, Jilin, Jules)

 - nbd signal hang fix (Shigeru)

 - block writeback throttling fix (Yu)

 - optimize the passthrough mapping handling (me)

 - prepare block cgroups to being gendisk based (Christoph)

 - get rid of an old PSI hack in the block layer, moving it to the
   callers instead where it belongs (Christoph)

 - blk-throttle fixes and cleanups (Yu)

 - misc fixes and cleanups (Liu Shixin, Liu Song, Miaohe, Pankaj,
   Ping-Xiang, Wolfram, Saurabh, Li Jinlin, Li Lei, Lin, Li zeming,
   Miaohe, Bart, Coly, Gaosheng

* tag 'for-6.1/block-2022-10-03' of git://git.kernel.dk/linux: (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
  ...

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/nbd.c
Simple merge

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

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/ioctl.c
Simple merge

diff --cc drivers/nvme/host/nvme.h
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 fs/btrfs/compression.c
Simple merge

diff --cc fs/erofs/zdata.c
Simple merge

diff --cc include/linux/blk-mq.h
Simple merge

diff --cc include/linux/blkdev.h
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