From: John Garry <john.garry@huawei.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>,
James Bottomley <James.Bottomley@HansenPartnership.com>,
Xiang Chen <chenxiang66@hisilicon.com>
Subject: Re: linux-next: manual merge of the scsi-mkp tree with Linus' tree
Date: Mon, 11 Feb 2019 09:24:59 +0000 [thread overview]
Message-ID: <e2f8faf4-143f-2d1d-efe8-bd30b593a2fd@huawei.com> (raw)
In-Reply-To: <20190211153127.09756262@canb.auug.org.au>
On 11/02/2019 04:31, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the scsi-mkp tree got a conflict in:
>
> drivers/scsi/hisi_sas/hisi_sas_v3_hw.c
>
> between commit:
>
> 7bb25a89aad2 ("scsi: hisi_sas: Set protection parameters prior to adding SCSI host")
>
> from Linus' tree and commit:
>
> b3cce125cb1e ("scsi: hisi_sas: Add support for DIX feature for v3 hw")
>
> from the scsi-mkp tree.
>
> I fixed it up (I think - 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.
>
The merge looks ok, thanks
JFYI, I did mention in the relevant patchset cover letter that the
series depends on commit 7bb25a89aad2 ("scsi: hisi_sas: Set protection
parameters prior to adding SCSI host"), which was not on Martin's 5.1
queue. The series seems to apply cleanly to that same branch without
this patch.
John
next prev parent reply other threads:[~2019-02-11 9:24 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-02-11 4:31 linux-next: manual merge of the scsi-mkp tree with Linus' tree Stephen Rothwell
2019-02-11 9:24 ` John Garry [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-07 4:44 Stephen Rothwell
2019-02-07 18:30 ` James Smart
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=e2f8faf4-143f-2d1d-efe8-bd30b593a2fd@huawei.com \
--to=john.garry@huawei.com \
--cc=James.Bottomley@HansenPartnership.com \
--cc=chenxiang66@hisilicon.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).