Hi all,

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

  drivers/scsi/mpi3mr/mpi3mr_transport.c

between commit:

  9f365cb8bbd0 ("scsi: mpi3mr: Use proper format specifier in mpi3mr_sas_port_add()")

from Linus' tree and commit:

  de24085328c0 ("scsi: mpi3mr: Correct a test in mpi3mr_sas_port_add()")

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_transport.c
index 82aa4e418c5a,27865ee896d7..000000000000
--- a/drivers/scsi/mpi3mr/mpi3mr_transport.c
+++ b/drivers/scsi/mpi3mr/mpi3mr_transport.c
@@@ -1363,8 -1377,8 +1377,8 @@@ static struct mpi3mr_sas_port *mpi3mr_s
  		    (mr_sas_node->phy[i].hba_port != hba_port))
  			continue;
  
- 		if (i > sizeof(mr_sas_port->phy_mask) * 8) {
+ 		if (i >= sizeof(mr_sas_port->phy_mask) * 8) {
 -			ioc_warn(mrioc, "skipping port %u, max allowed value is %lu\n",
 +			ioc_warn(mrioc, "skipping port %u, max allowed value is %zu\n",
  			    i, sizeof(mr_sas_port->phy_mask) * 8);
  			goto out_fail;
  		}

Stephen,

> Today's linux-next merge of the scsi-mkp tree got a conflict in:
>
>   drivers/scsi/mpi3mr/mpi3mr_transport.c

Now resolved. Thanks!

-- 
Martin K. Petersen	Oracle Linux Engineering