From: James Smart <jsmart2021@gmail.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>,
"Martin K. Petersen" <martin.petersen@oracle.com>
Cc: Linux Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
"Ewan D. Milne" <emilne@redhat.com>
Subject: Re: linux-next: manual merge of the scsi-mkp tree with Linus' tree
Date: Thu, 7 Feb 2019 10:30:02 -0800 [thread overview]
Message-ID: <eea2211e-6342-1949-5a3e-2c08b87db0d9@gmail.com> (raw)
In-Reply-To: <20190207154446.3f48c496@canb.auug.org.au>
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.smart@broadcom.com>
next prev parent reply other threads:[~2019-02-07 18:30 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-02-07 4:44 linux-next: manual merge of the scsi-mkp tree with Linus' tree Stephen Rothwell
2019-02-07 18:30 ` James Smart [this message]
-- strict thread matches above, loose matches on Subject: below --
2023-08-28 3:02 Stephen Rothwell
2023-09-01 0:23 ` Karan Tilak Kumar (kartilak)
2023-03-20 1:16 Stephen Rothwell
2022-02-14 3:29 Stephen Rothwell
2022-02-14 8:57 ` John Garry
2021-12-08 3:32 Stephen Rothwell
2021-10-06 4:44 Stephen Rothwell
2021-08-11 5:40 Stephen Rothwell
2021-08-11 5:53 ` Sreekanth Reddy
2021-08-12 3:25 ` Martin K. Petersen
2020-09-03 5:21 Stephen Rothwell
2020-09-02 5:15 Stephen Rothwell
2020-09-02 5:12 Stephen Rothwell
2020-09-11 4:47 ` Stephen Rothwell
2020-06-10 2:17 Stephen Rothwell
2020-06-11 2:12 ` Stephen Rothwell
2019-02-11 4:31 Stephen Rothwell
2019-02-11 9:24 ` John Garry
2018-12-10 6:17 Stephen Rothwell
2018-12-10 7:09 ` Stephen Rothwell
2018-10-18 4:15 Stephen Rothwell
2018-08-03 6:22 Stephen Rothwell
2018-08-03 6:04 Stephen Rothwell
2018-07-11 4:04 Stephen Rothwell
2018-07-12 4:29 ` Stephen Rothwell
2018-03-22 5:54 Stephen Rothwell
2017-11-30 1:51 Stephen Rothwell
2017-11-30 1:55 ` Stephen Rothwell
2017-12-01 2:14 ` Martin K. Petersen
2017-12-01 3:42 ` Stephen Rothwell
2017-09-01 4:48 Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=eea2211e-6342-1949-5a3e-2c08b87db0d9@gmail.com \
--to=jsmart2021@gmail.com \
--cc=emilne@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=martin.petersen@oracle.com \
--cc=sfr@canb.auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).