Merge branch '6.3/scsi-fixes' into 6.4/scsi-staging

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

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

diff --cc drivers/scsi/hisi_sas/hisi_sas_v3_hw.c
index c55bef584a9bb284af82735e8499683a6d820405,a63279f55d09607488d7784d2d8666375de62c3e..07eafae282c3ac1f2d0f100b9e24ffc8c272fcba
--- 1/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c
--- 2/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c
+++ b/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c
@@@ -2522,11 -2492,10 +2522,10 @@@ static int interrupt_preinit_v3_hw(stru
                return -ENOENT;
  
  
 -      hisi_hba->cq_nvecs = vectors - BASE_VECTORS_V3_HW;
 -      shost->nr_hw_queues = hisi_hba->cq_nvecs;
 +      hisi_hba->cq_nvecs = vectors - BASE_VECTORS_V3_HW - hisi_hba->iopoll_q_cnt;
 +      shost->nr_hw_queues = hisi_hba->cq_nvecs + hisi_hba->iopoll_q_cnt;
  
-       devm_add_action(&pdev->dev, hisi_sas_v3_free_vectors, pdev);
-       return 0;
+       return devm_add_action(&pdev->dev, hisi_sas_v3_free_vectors, pdev);
  }
  
  static int interrupt_init_v3_hw(struct hisi_hba *hisi_hba)

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

diff --cc drivers/scsi/lpfc/lpfc_init.c
Simple merge

diff --cc drivers/scsi/lpfc/lpfc_sli.c
Simple merge

diff --cc drivers/scsi/megaraid/megaraid_sas_base.c
Simple merge

diff --cc drivers/scsi/mpi3mr/mpi3mr.h
Simple merge

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

diff --cc drivers/scsi/mpi3mr/mpi3mr_fw.c
index e9b3684a3c8f9338cb75edbba01665f3b670eed8,a565817aa56d4b68149323a8132997844d081bf4..843f9e5511ec06a72be3011e9b0a8aaaff3fd546
--- 1/drivers/scsi/mpi3mr/mpi3mr_fw.c
--- 2/drivers/scsi/mpi3mr/mpi3mr_fw.c
+++ b/drivers/scsi/mpi3mr/mpi3mr_fw.c
@@@ -2603,6 -2627,8 +2626,7 @@@ static int mpi3mr_setup_admin_qpair(str
            MPI3MR_ADMIN_REPLY_FRAME_SZ;
        mrioc->admin_reply_ci = 0;
        mrioc->admin_reply_ephase = 1;
 -      mrioc->admin_reply_base = NULL;
+       atomic_set(&mrioc->admin_reply_q_in_use, 0);
  
        if (!mrioc->admin_req_base) {
                mrioc->admin_req_base = dma_alloc_coherent(&mrioc->pdev->dev,

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

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

diff --cc drivers/scsi/mpt3sas/mpt3sas_base.c
Simple merge

diff --cc drivers/scsi/qla2xxx/qla_gbl.h
Simple merge

diff --cc drivers/scsi/qla2xxx/qla_os.c
Simple merge

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

diff --cc drivers/ufs/host/ufs-qcom.c
Simple merge