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

[Mark Brown <broonie@kernel.org>]

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

Hi all,

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

  drivers/scsi/mpi3mr/mpi3mr_transport.c

between commits:

  419d129f970aa ("scsi: mpi3mr: Fix target device refcount leak in mpi3mr_sas_port_add()")
  dba9e2181ca5e ("scsi: mpi3mr: Fix NULL pointer dereference in mpi3mr_sas_port_add()")

from the origin tree and commit:

  29e3f0856e854 ("scsi: mpi3mr: Fix SAS port allocation and registration error handling")

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_transport.c
index 232af978d7372,a3412cd4ca5bc..0000000000000
--- a/drivers/scsi/mpi3mr/mpi3mr_transport.c
+++ b/drivers/scsi/mpi3mr/mpi3mr_transport.c
@@@ -1504,11 -1560,17 +1560,20 @@@ static struct mpi3mr_sas_port *mpi3mr_s
  	return mr_sas_port;
  
   out_fail:
+ 	if (tgtdev) {
+ 		tgtdev->dev_spec.sas_sata_inf.pend_sas_rphy_add = 0;
+ 		tgtdev->dev_spec.sas_sata_inf.rphy = NULL;
+ 		mpi3mr_tgtdev_put(tgtdev);
+ 	}
+ 
  	list_for_each_entry_safe(mr_sas_phy, next, &mr_sas_port->phy_list,
- 	    port_siblings)
+ 	    port_siblings) {
+ 		mr_sas_phy->phy_belongs_to_port = 0;
  		list_del(&mr_sas_phy->port_siblings);
+ 	}
 +	if (tgtdev)
 +		mpi3mr_tgtdev_put(tgtdev);
  	kfree(mr_sas_port);
  	return NULL;
  }

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