Merge tag 'block-5.14-2021-07-08' of git://git.kernel.dk/linux-block

Pull more block updates from Jens Axboe:
 "A combination of changes that ended up depending on both the driver
  and core branch (and/or the IDE removal), and a few late arriving
  fixes. In detail:

   - Fix io ticks wrap-around issue (Chunguang)

   - nvme-tcp sock locking fix (Maurizio)

   - s390-dasd fixes (Kees, Christoph)

   - blk_execute_rq polling support (Keith)

   - blk-cgroup RCU iteration fix (Yu)

   - nbd backend ID addition (Prasanna)

   - Partition deletion fix (Yufen)

   - Use blk_mq_alloc_disk for mmc, mtip32xx, ubd (Christoph)

   - Removal of now dead block request types due to IDE removal
     (Christoph)

   - Loop probing and control device cleanups (Christoph)

   - Device uevent fix (Christoph)

   - Misc cleanups/fixes (Tetsuo, Christoph)"

* tag 'block-5.14-2021-07-08' of git://git.kernel.dk/linux-block: (34 commits)
  blk-cgroup: prevent rcu_sched detected stalls warnings while iterating blkgs
  block: fix the problem of io_ticks becoming smaller
  nvme-tcp: can't set sk_user_data without write_lock
  loop: remove unused variable in loop_set_status()
  block: remove the bdgrab in blk_drop_partitions
  block: grab a device refcount in disk_uevent
  s390/dasd: Avoid field over-reading memcpy()
  dasd: unexport dasd_set_target_state
  block: check disk exist before trying to add partition
  ubd: remove dead code in ubd_setup_common
  nvme: use return value from blk_execute_rq()
  block: return errors from blk_execute_rq()
  nvme: use blk_execute_rq() for passthrough commands
  block: support polling through blk_execute_rq
  block: remove REQ_OP_SCSI_{IN,OUT}
  block: mark blk_mq_init_queue_data static
  loop: rewrite loop_exit using idr_for_each_entry
  loop: split loop_lookup
  loop: don't allow deleting an unspecified loop device
  loop: move loop_ctl_mutex locking into loop_add
  ...

diff --cc arch/um/drivers/ubd_kern.c
Simple merge

diff --cc block/bsg-lib.c
Simple merge

diff --cc block/bsg.c
Simple merge

diff --cc block/scsi_ioctl.c
Simple merge

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

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

diff --cc drivers/scsi/scsi_lib.c
index 6b994ba,6cc7dad..c9a91a5
--- 1/drivers/scsi/scsi_lib.c
--- 2/drivers/scsi/scsi_lib.c
+++ b/drivers/scsi/scsi_lib.c
@@@ -215,19 -215,16 +215,19 @@@ int __scsi_execute(struct scsi_device *
  
        req = blk_get_request(sdev->request_queue,
                        data_direction == DMA_TO_DEVICE ?
-                       REQ_OP_SCSI_OUT : REQ_OP_SCSI_IN,
+                       REQ_OP_DRV_OUT : REQ_OP_DRV_IN,
                        rq_flags & RQF_PM ? BLK_MQ_REQ_PM : 0);
        if (IS_ERR(req))
 -              return ret;
 -      rq = scsi_req(req);
 +              return PTR_ERR(req);
  
 -      if (bufflen &&  blk_rq_map_kern(sdev->request_queue, req,
 -                                      buffer, bufflen, GFP_NOIO))
 -              goto out;
 +      rq = scsi_req(req);
  
 +      if (bufflen) {
 +              ret = blk_rq_map_kern(sdev->request_queue, req,
 +                                    buffer, bufflen, GFP_NOIO);
 +              if (ret)
 +                      goto out;
 +      }
        rq->cmd_len = COMMAND_SIZE(cmd[0]);
        memcpy(rq->cmd, cmd, rq->cmd_len);
        rq->retries = retries;

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

diff --cc drivers/scsi/st.c
index 66f48bd,86c951c..c6f1454
--- 1/drivers/scsi/st.c
--- 2/drivers/scsi/st.c
+++ b/drivers/scsi/st.c
@@@ -549,9 -549,9 +549,9 @@@ static int st_scsi_execute(struct st_re
  
        req = blk_get_request(SRpnt->stp->device->request_queue,
                        data_direction == DMA_TO_DEVICE ?
-                       REQ_OP_SCSI_OUT : REQ_OP_SCSI_IN, 0);
+                       REQ_OP_DRV_OUT : REQ_OP_DRV_IN, 0);
        if (IS_ERR(req))
 -              return DRIVER_ERROR << 24;
 +              return PTR_ERR(req);
        rq = scsi_req(req);
        req->rq_flags |= RQF_QUIET;
  

diff --cc drivers/target/target_core_pscsi.c
Simple merge

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

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