On 2/6/2019 8:44 PM, Stephen Rothwell wrote:
Hi all,Today's linux-next merge of the scsi-mkp tree got a conflict in: drivers/scsi/lpfc/lpfc_nvme.c between commit: 7961cba6f7d8 ("scsi: lpfc: nvme: avoid hang / use-after-free when destroying localport") from Linus' tree and commit: 4c47efc140fa ("scsi: lpfc: Move SCSI and NVME Stats to hardware queue structures") 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.
Thank You. The fixup patch looks correct. Martin, let me know if there's anything else you'd like me to do. -- james Signed-off-by: James Smart <james.sm...@broadcom.com>
