From: James Morris <jmorris@namei•org>
To: Stephen Rothwell <sfr@canb•auug.org.au>
Cc: David Howells <dhowells@redhat•com>,
"Martin K. Petersen" <martin.petersen@oracle•com>,
Linux-Next Mailing List <linux-next@vger•kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>
Subject: Re: linux-next: manual merge of the scsi-mkp tree with the efi-lock-down tree
Date: Mon, 9 Apr 2018 12:51:53 +1000 (AEST) [thread overview]
Message-ID: <alpine.LRH.2.21.1804091251380.14450@namei.org> (raw)
In-Reply-To: <20180409115831.46a351ef@canb.auug.org.au>
On Mon, 9 Apr 2018, Stephen Rothwell wrote:
> Hi all,
>
> On Fri, 6 Apr 2018 09:22:16 +1000 Stephen Rothwell <sfr@canb•auug.org.au> wrote:
> >
> > On Thu, 15 Mar 2018 18:34:12 +1100 Stephen Rothwell <sfr@canb•auug.org.au> wrote:
> > >
> > > Today's linux-next merge of the scsi-mkp tree got a conflict in:
> > >
> > > drivers/scsi/eata.c
> > >
> > > between commit:
> > >
> > > 5b76b160badb ("scsi: Lock down the eata driver")
> > >
> > > from the efi-lock-down tree and commit:
> > >
> > > 6b1745caa14a ("scsi: eata: eata-pio: Deprecate legacy EATA drivers")
> > >
> > > from the scsi-mkp tree.
> > >
> > > I fixed it up (I just removed the file) 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.
> >
> > This is now a conflict between the efi-lock-down tree and Linus' tree.
>
> This is now a conflict between the security tree and Linus' tree.
That's odd, my next-general branch is merged to Linus.
--
James Morris
<jmorris@namei•org>
next prev parent reply other threads:[~2018-04-09 2:51 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-03-15 7:34 linux-next: manual merge of the scsi-mkp tree with the efi-lock-down tree Stephen Rothwell
2018-04-05 23:22 ` Stephen Rothwell
2018-04-09 1:58 ` Stephen Rothwell
2018-04-09 2:51 ` James Morris [this message]
2018-04-09 4:22 ` Stephen Rothwell
2018-04-09 4:29 ` James Morris
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=alpine.LRH.2.21.1804091251380.14450@namei.org \
--to=jmorris@namei$(echo .)org \
--cc=dhowells@redhat$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=martin.petersen@oracle$(echo .)com \
--cc=sfr@canb$(echo .)auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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