Hi all,

Today's linux-next merge of the scsi-mkp tree got a conflict in:

  drivers/scsi/mpi3mr/mpi3mr_fw.c

between commit:

  fa96392ebebc8 ("scsi: mpi3mr: Add NULL checks when resetting request and reply queues")

from the origin tree and commit:

  9d660e482071b ("scsi: mpi3mr: Add queue-full tracking for operational request queues")

from the scsi-mkp tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

diff --cc drivers/scsi/mpi3mr/mpi3mr_fw.c
index c744210cc9018,01042eaf0dff4..0000000000000
--- a/drivers/scsi/mpi3mr/mpi3mr_fw.c
+++ b/drivers/scsi/mpi3mr/mpi3mr_fw.c
@@@ -4817,25 -4828,22 +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);
 +		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);
 +		}
  
 -		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->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);