linux-next: manual merge of the scsi-mkp tree with Linus' tree

[Stephen Rothwell <sfr@canb.auug.org.au>]

[-- Attachment #1: Type: text/plain, Size: 1303 bytes --]

Hi all,

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

  drivers/scsi/mpi3mr/mpi3mr_fw.c

between commit:

  02ca7da2919a ("scsi: mpi3mr: ioctl timeout when disabling/enabling interrupt")

from Linus' tree and commit:

  23b3d1cf1572 ("scsi: mpi3mr: Fix admin queue memory leak upon soft reset")

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.

-- 
Cheers,
Stephen Rothwell

diff --cc drivers/scsi/mpi3mr/mpi3mr_fw.c
index a565817aa56d,e9b3684a3c8f..000000000000
--- a/drivers/scsi/mpi3mr/mpi3mr_fw.c
+++ b/drivers/scsi/mpi3mr/mpi3mr_fw.c
@@@ -2627,8 -2603,6 +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,

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]