Merge branch '5.12/scsi-fixes' into 5.13/scsi-staging

Resolve a couple of conflicts between the 5.12 fixes branch and the
5.13 staging tree (iSCSI target and UFS).

Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

diff --cc drivers/scsi/pm8001/pm8001_hwi.c
Simple merge

diff --cc drivers/scsi/ufs/ufshcd.c
index 58d7f26,d3d05e9..0625da7
--- 1/drivers/scsi/ufs/ufshcd.c
--- 2/drivers/scsi/ufs/ufshcd.c
+++ b/drivers/scsi/ufs/ufshcd.c
@@@ -6398,17 -6399,16 +6396,16 @@@ static int __ufshcd_issue_tm_cmd(struc
        ufshcd_hold(hba, false);
  
        spin_lock_irqsave(host->host_lock, flags);
-       task_tag = hba->nutrs + free_slot;
+       blk_mq_start_request(req);
  
 -      treq->req_header.dword_0 |= cpu_to_be32(task_tag);
+       task_tag = req->tag;
 +      treq->upiu_req.req_header.dword_0 |= cpu_to_be32(task_tag);
  
-       memcpy(hba->utmrdl_base_addr + free_slot, treq, sizeof(*treq));
-       ufshcd_vops_setup_task_mgmt(hba, free_slot, tm_function);
+       memcpy(hba->utmrdl_base_addr + task_tag, treq, sizeof(*treq));
+       ufshcd_vops_setup_task_mgmt(hba, task_tag, tm_function);
  
        /* send command to the controller */
-       __set_bit(free_slot, &hba->outstanding_tasks);
+       __set_bit(task_tag, &hba->outstanding_tasks);
  
        /* Make sure descriptors are ready before ringing the task doorbell */
        wmb();

diff --cc drivers/target/iscsi/iscsi_target.c
index cf7f046,e5c443b..2c54c5d
--- 1/drivers/target/iscsi/iscsi_target.c
--- 2/drivers/target/iscsi/iscsi_target.c
+++ b/drivers/target/iscsi/iscsi_target.c
@@@ -1166,8 -1166,8 +1166,10 @@@ int iscsit_setup_scsi_cmd(struct iscsi_
  
        target_get_sess_cmd(&cmd->se_cmd, true);
  
 -      cmd->sense_reason = target_cmd_init_cdb(&cmd->se_cmd, hdr->cdb);
+       cmd->se_cmd.tag = (__force u32)cmd->init_task_tag;
 +      cmd->sense_reason = target_cmd_init_cdb(&cmd->se_cmd, hdr->cdb,
 +                                              GFP_KERNEL);
++
        if (cmd->sense_reason) {
                if (cmd->sense_reason == TCM_OUT_OF_RESOURCES) {
                        return iscsit_add_reject_cmd(cmd,