Merge branch 'for-5.15/block' into for-next

* for-5.15/block: (115 commits)
  null_blk: add error handling support for add_disk()
  virtio_blk: add error handling support for add_disk()
  block: add error handling for device_add_disk / add_disk
  block: return errors from disk_alloc_events
  block: return errors from blk_integrity_add
  block: call blk_register_queue earlier in device_add_disk
  block: call blk_integrity_add earlier in device_add_disk
  block: create the bdi link earlier in device_add_disk
  block: call bdev_add later in device_add_disk
  block: fold register_disk into device_add_disk
  block: add a sanity check for a live disk in del_gendisk
  block: add an explicit ->disk backpointer to the request_queue
  block: hold a request_queue reference for the lifetime of struct gendisk
  block: pass a request_queue to __blk_alloc_disk
  block: remove the minors argument to __alloc_disk_node
  block: remove alloc_disk and alloc_disk_node
  block: cleanup the lockdep handling in *alloc_disk
  sg: do not allocate a gendisk
  st: do not allocate a gendisk
  nvme: use blk_mq_alloc_disk
  ...

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

diff --cc block/Makefile
Simple merge

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

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

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

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

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

diff --cc block/blk.h
Simple merge

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

diff --cc block/partitions/ldm.c
Simple merge

diff --cc drivers/block/virtio_blk.c
index afb37aac09e88896050061c379b5a5a8c31f1149,63dc121a4c43b9d29370d4f1401579b05da45b78..57c6ae7debd97536fe75168bb04cd539ca186e24
--- 1/drivers/block/virtio_blk.c
--- 2/drivers/block/virtio_blk.c
+++ b/drivers/block/virtio_blk.c
@@@ -839,14 -820,6 +836,14 @@@ static int virtblk_probe(struct virtio_
        else
                blk_size = queue_logical_block_size(q);
  
-               goto err_cleanup_disk;
 +      if (unlikely(blk_size < SECTOR_SIZE || blk_size > PAGE_SIZE)) {
 +              dev_err(&vdev->dev,
 +                      "block size is changed unexpectedly, now is %u\n",
 +                      blk_size);
 +              err = -EINVAL;
++              goto out_cleanup_disk;
 +      }
 +
        /* Use topology information if available */
        err = virtio_cread_feature(vdev, VIRTIO_BLK_F_TOPOLOGY,
                                   struct virtio_blk_config, physical_block_exp,

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

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