From: Martin K. Petersen <martin.petersen@oracle.com>
Date: Fri, 3 Apr 2026 00:31:22 +0000 (-0400)
Subject: Merge branch 7.0/scsi-fixes into 7.1/scsi-staging
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=fc0a1d05e494fd218a51e46f6664d1e14d4327ea;p=thirdparty%2Flinux.git

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>
---

fc0a1d05e494fd218a51e46f6664d1e14d4327ea
diff --cc drivers/scsi/mpi3mr/mpi3mr_fw.c
index 01042eaf0dff4,c744210cc9018..04c2b45b7f452
--- a/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);