Merge branch 7.0/scsi-fixes into 7.1/scsi-staging

Pull in fixes to resolve mpi3mr merge conflict.

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

diff --cc drivers/scsi/hisi_sas/hisi_sas_main.c
Simple merge

diff --cc drivers/scsi/hisi_sas/hisi_sas_v3_hw.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/lpfc/lpfc_sli4.h
Simple merge

diff --cc drivers/scsi/mpi3mr/mpi3mr_fw.c
index 01042eaf0dff4720c65f72b617cbb63d645f0c23,c744210cc901886f9a91afb7bdd3698402a8fae0..04c2b45b7f452c793bc257adc5a76280a4bd61a3
--- 1/drivers/scsi/mpi3mr/mpi3mr_fw.c
--- 2/drivers/scsi/mpi3mr/mpi3mr_fw.c
+++ b/drivers/scsi/mpi3mr/mpi3mr_fw.c
@@@ -4828,22 -4817,25 +4838,26 @@@ void mpi3mr_memset_buffers(struct mpi3m
        }
  
        for (i = 0; i < mrioc->num_queues; i++) {
-               mrioc->op_reply_qinfo[i].qid = 0;
-               mrioc->op_reply_qinfo[i].ci = 0;
-               mrioc->op_reply_qinfo[i].num_replies = 0;
-               mrioc->op_reply_qinfo[i].ephase = 0;
-               atomic_set(&mrioc->op_reply_qinfo[i].pend_ios, 0);
-               atomic_set(&mrioc->op_reply_qinfo[i].in_use, 0);
-               mpi3mr_memset_op_reply_q_buffers(mrioc, i);
- 
-               mrioc->req_qinfo[i].ci = 0;
-               mrioc->req_qinfo[i].pi = 0;
-               mrioc->req_qinfo[i].num_requests = 0;
-               mrioc->req_qinfo[i].qid = 0;
-               mrioc->req_qinfo[i].reply_qid = 0;
-               spin_lock_init(&mrioc->req_qinfo[i].q_lock);
-               mrioc->req_qinfo[i].last_full_host_tag = 0;
-               mpi3mr_memset_op_req_q_buffers(mrioc, i);
+               if (mrioc->op_reply_qinfo) {
+                       mrioc->op_reply_qinfo[i].qid = 0;
+                       mrioc->op_reply_qinfo[i].ci = 0;
+                       mrioc->op_reply_qinfo[i].num_replies = 0;
+                       mrioc->op_reply_qinfo[i].ephase = 0;
+                       atomic_set(&mrioc->op_reply_qinfo[i].pend_ios, 0);
+                       atomic_set(&mrioc->op_reply_qinfo[i].in_use, 0);
+                       mpi3mr_memset_op_reply_q_buffers(mrioc, i);
+               }
+ 
+               if (mrioc->req_qinfo) {
+                       mrioc->req_qinfo[i].ci = 0;
+                       mrioc->req_qinfo[i].pi = 0;
+                       mrioc->req_qinfo[i].num_requests = 0;
+                       mrioc->req_qinfo[i].qid = 0;
+                       mrioc->req_qinfo[i].reply_qid = 0;
+                       spin_lock_init(&mrioc->req_qinfo[i].q_lock);
++                      mrioc->req_qinfo[i].last_full_host_tag = 0;
+                       mpi3mr_memset_op_req_q_buffers(mrioc, i);
+               }
        }
  
        atomic_set(&mrioc->pend_large_data_sz, 0);

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

diff --cc drivers/target/loopback/tcm_loop.c
Simple merge

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

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