Merge branch '6.10/scsi-fixes' into 6.11/scsi-staging

Pull in my fixes branch to resolve an mpi3mr merge conflict reported
by sfr.

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

diff --cc drivers/scsi/mpi3mr/mpi3mr_app.c
Simple merge

diff --cc drivers/scsi/mpi3mr/mpi3mr_transport.c
index 27865ee896d756a6668d060d540c9711c24f8dc7,82aa4e418c5a895c692c6c5ce57340e73edda34b..ccd23def2e0cfa7e0fe68d312f137c1a4f5b36c9
--- 1/drivers/scsi/mpi3mr/mpi3mr_transport.c
--- 2/drivers/scsi/mpi3mr/mpi3mr_transport.c
+++ b/drivers/scsi/mpi3mr/mpi3mr_transport.c
@@@ -1377,8 -1363,8 +1377,8 @@@ static struct mpi3mr_sas_port *mpi3mr_s
                    (mr_sas_node->phy[i].hba_port != hba_port))
                        continue;
  
 -              if (i > sizeof(mr_sas_port->phy_mask) * 8) {
 +              if (i >= sizeof(mr_sas_port->phy_mask) * 8) {
-                       ioc_warn(mrioc, "skipping port %u, max allowed value is %lu\n",
+                       ioc_warn(mrioc, "skipping port %u, max allowed value is %zu\n",
                            i, sizeof(mr_sas_port->phy_mask) * 8);
                        goto out_fail;
                }

diff --cc drivers/ufs/core/ufs-mcq.c
index 4bcae410c2681e5cfc6010f11f4f64f84cf45841,c532416aec2296599125fbb101e1b89bb5c88bc5..a4593ba3af61f86cd81f4330333e930fea3e28b8
--- 1/drivers/ufs/core/ufs-mcq.c
--- 2/drivers/ufs/core/ufs-mcq.c
+++ b/drivers/ufs/core/ufs-mcq.c
@@@ -111,25 -111,11 +111,24 @@@ EXPORT_SYMBOL_GPL(ufshcd_mcq_config_mac
  struct ufs_hw_queue *ufshcd_mcq_req_to_hwq(struct ufs_hba *hba,
                                         struct request *req)
  {
-       u32 utag = blk_mq_unique_tag(req);
-       u32 hwq = blk_mq_unique_tag_to_hwq(utag);
+       struct blk_mq_hw_ctx *hctx = READ_ONCE(req->mq_hctx);
  
-       return &hba->uhq[hwq];
+       return hctx ? &hba->uhq[hctx->queue_num] : NULL;
  }
  
 +/**
 + * ufshcd_mcq_queue_cfg_addr - get an start address of the MCQ Queue Config
 + * Registers.
 + * @hba: per adapter instance
 + *
 + * Return: Start address of MCQ Queue Config Registers in HCI
 + */
 +unsigned int ufshcd_mcq_queue_cfg_addr(struct ufs_hba *hba)
 +{
 +      return FIELD_GET(QCFGPTR, hba->mcq_capabilities) * 0x200;
 +}
 +EXPORT_SYMBOL_GPL(ufshcd_mcq_queue_cfg_addr);
 +
  /**
   * ufshcd_mcq_decide_queue_depth - decide the queue depth
   * @hba: per adapter instance

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