* linux-next: manual merge of the scsi-mkp tree with the efi-lock-down tree
@ 2018-03-15 7:34 Stephen Rothwell
2018-04-05 23:22 ` Stephen Rothwell
0 siblings, 1 reply; 6+ messages in thread
From: Stephen Rothwell @ 2018-03-15 7:34 UTC (permalink / raw)
To: Martin K. Petersen, David Howells
Cc: Linux-Next Mailing List, Linux Kernel Mailing List
[-- Attachment #1: Type: text/plain, Size: 744 bytes --]
Hi all,
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.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: linux-next: manual merge of the scsi-mkp tree with the efi-lock-down tree
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
0 siblings, 1 reply; 6+ messages in thread
From: Stephen Rothwell @ 2018-04-05 23:22 UTC (permalink / raw)
To: David Howells
Cc: Martin K. Petersen, Linux-Next Mailing List, Linux Kernel Mailing List
[-- Attachment #1: Type: text/plain, Size: 942 bytes --]
Hi all,
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.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: linux-next: manual merge of the scsi-mkp tree with the efi-lock-down tree
2018-04-05 23:22 ` Stephen Rothwell
@ 2018-04-09 1:58 ` Stephen Rothwell
2018-04-09 2:51 ` James Morris
0 siblings, 1 reply; 6+ messages in thread
From: Stephen Rothwell @ 2018-04-09 1:58 UTC (permalink / raw)
To: James Morris
Cc: David Howells, Martin K. Petersen, Linux-Next Mailing List,
Linux Kernel Mailing List
[-- Attachment #1: Type: text/plain, Size: 1148 bytes --]
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.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: linux-next: manual merge of the scsi-mkp tree with the efi-lock-down tree
2018-04-09 1:58 ` Stephen Rothwell
@ 2018-04-09 2:51 ` James Morris
2018-04-09 4:22 ` Stephen Rothwell
0 siblings, 1 reply; 6+ messages in thread
From: James Morris @ 2018-04-09 2:51 UTC (permalink / raw)
To: Stephen Rothwell
Cc: David Howells, Martin K. Petersen, Linux-Next Mailing List,
Linux Kernel Mailing List
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>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: linux-next: manual merge of the scsi-mkp tree with the efi-lock-down tree
2018-04-09 2:51 ` James Morris
@ 2018-04-09 4:22 ` Stephen Rothwell
2018-04-09 4:29 ` James Morris
0 siblings, 1 reply; 6+ messages in thread
From: Stephen Rothwell @ 2018-04-09 4:22 UTC (permalink / raw)
To: James Morris
Cc: David Howells, Martin K. Petersen, Linux-Next Mailing List,
Linux Kernel Mailing List
[-- Attachment #1: Type: text/plain, Size: 369 bytes --]
Hi James,
On Mon, 9 Apr 2018 12:51:53 +1000 (AEST) James Morris <jmorris@namei.org> wrote:
>
> That's odd, my next-general branch is merged to Linus.
The security tree in linux-next is
git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security.git#next-testing
which has the efi-lock-down tree merged into it.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: linux-next: manual merge of the scsi-mkp tree with the efi-lock-down tree
2018-04-09 4:22 ` Stephen Rothwell
@ 2018-04-09 4:29 ` James Morris
0 siblings, 0 replies; 6+ messages in thread
From: James Morris @ 2018-04-09 4:29 UTC (permalink / raw)
To: Stephen Rothwell
Cc: David Howells, Martin K. Petersen, Linux-Next Mailing List,
Linux Kernel Mailing List
On Mon, 9 Apr 2018, Stephen Rothwell wrote:
> Hi James,
>
> On Mon, 9 Apr 2018 12:51:53 +1000 (AEST) James Morris <jmorris@namei.org> wrote:
> >
> > That's odd, my next-general branch is merged to Linus.
>
> The security tree in linux-next is
>
> git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security.git#next-testing
>
> which has the efi-lock-down tree merged into it.
Ahh, I see. I'll rebase next-testing.
--
James Morris
<jmorris@namei.org>
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2018-04-09 4:29 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
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
2018-04-09 4:22 ` Stephen Rothwell
2018-04-09 4:29 ` James Morris
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.