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

From: Stephen Rothwell
Date: Thu Oct 18 2018 - 00:15:08 EST

Hi Martin,

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


between commit:

9e210178267b ("scsi: lpfc: Synchronize access to remoteport via rport")

from Linus' tree and commit:

d021613ee3ac ("scsi: lpfc: Remove set but not used variables 'tgtp'")

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.

Stephen Rothwell

diff --cc drivers/scsi/lpfc/lpfc_debugfs.c
index aec5b10a8c85,d6e4cbfe3273..000000000000
--- a/drivers/scsi/lpfc/lpfc_debugfs.c
+++ b/drivers/scsi/lpfc/lpfc_debugfs.c
@@@ -550,8 -550,7 +550,7 @@@ lpfc_debugfs_nodelist_data(struct lpfc_
struct lpfc_nodelist *ndlp;
unsigned char *statep;
struct nvme_fc_local_port *localport;
- struct lpfc_nvmet_tgtport *tgtp;
- struct nvme_fc_remote_port *nrport;
+ struct nvme_fc_remote_port *nrport = NULL;
struct lpfc_nvme_rport *rport;


Attachment: pgpIRGVYKP2WD.pgp
Description: OpenPGP digital signature