* linux-next: manual merge of the keys tree with the m86k tree
@ 2020-01-13 1:36 Stephen Rothwell
2020-01-13 1:37 ` Stephen Rothwell
0 siblings, 1 reply; 3+ messages in thread
From: Stephen Rothwell @ 2020-01-13 1:36 UTC (permalink / raw)
To: David Howells, Geert Uytterhoeven
Cc: Linux Next Mailing List, Linux Kernel Mailing List, Kars de Jong
[-- Attachment #1: Type: text/plain, Size: 735 bytes --]
Hi all,
Today's linux-next merge of the keys tree got a conflict in:
arch/m68k/kernel/syscalls/syscall.tbl
between commit:
e8bb2a2a1d51 ("m68k: Wire up clone3() syscall")
from the m86k tree and commit:
519c484a997a ("Add a general, global device notification watch list")
from the keys 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.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: linux-next: manual merge of the keys tree with the m86k tree
2020-01-13 1:36 linux-next: manual merge of the keys tree with the m86k tree Stephen Rothwell
@ 2020-01-13 1:37 ` Stephen Rothwell
2020-01-27 20:52 ` Stephen Rothwell
0 siblings, 1 reply; 3+ messages in thread
From: Stephen Rothwell @ 2020-01-13 1:37 UTC (permalink / raw)
To: David Howells, Geert Uytterhoeven
Cc: Linux Next Mailing List, Linux Kernel Mailing List, Kars de Jong
[-- Attachment #1: Type: text/plain, Size: 1370 bytes --]
Hi all,
On Mon, 13 Jan 2020 12:36:03 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next merge of the keys tree got a conflict in:
>
> arch/m68k/kernel/syscalls/syscall.tbl
>
> between commit:
>
> e8bb2a2a1d51 ("m68k: Wire up clone3() syscall")
>
> from the m86k tree and commit:
>
> 519c484a997a ("Add a general, global device notification watch list")
>
> from the keys 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.
Sorry, forgot the diff ...
--
Cheers,
Stephen Rothwell
diff --cc arch/m68k/kernel/syscalls/syscall.tbl
index b911e0f50a71,83e4e8784b88..000000000000
--- a/arch/m68k/kernel/syscalls/syscall.tbl
+++ b/arch/m68k/kernel/syscalls/syscall.tbl
@@@ -434,5 -434,5 +434,6 @@@
432 common fsmount sys_fsmount
433 common fspick sys_fspick
434 common pidfd_open sys_pidfd_open
-# 435 reserved for clone3
+435 common clone3 __sys_clone3
+ 436 common watch_devices sys_watch_devices
+437 common openat2 sys_openat2
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: linux-next: manual merge of the keys tree with the m86k tree
2020-01-13 1:37 ` Stephen Rothwell
@ 2020-01-27 20:52 ` Stephen Rothwell
0 siblings, 0 replies; 3+ messages in thread
From: Stephen Rothwell @ 2020-01-27 20:52 UTC (permalink / raw)
To: David Howells, Geert Uytterhoeven
Cc: Linux Next Mailing List, Linux Kernel Mailing List, Kars de Jong
[-- Attachment #1: Type: text/plain, Size: 1676 bytes --]
Hi all,
On Mon, 13 Jan 2020 12:37:00 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> On Mon, 13 Jan 2020 12:36:03 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> >
> > Today's linux-next merge of the keys tree got a conflict in:
> >
> > arch/m68k/kernel/syscalls/syscall.tbl
> >
> > between commit:
> >
> > e8bb2a2a1d51 ("m68k: Wire up clone3() syscall")
> >
> > from the m86k tree and commit:
> >
> > 519c484a997a ("Add a general, global device notification watch list")
> >
> > from the keys 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.
>
> Sorry, forgot the diff ...
>
> --
> Cheers,
> Stephen Rothwell
>
> diff --cc arch/m68k/kernel/syscalls/syscall.tbl
> index b911e0f50a71,83e4e8784b88..000000000000
> --- a/arch/m68k/kernel/syscalls/syscall.tbl
> +++ b/arch/m68k/kernel/syscalls/syscall.tbl
> @@@ -434,5 -434,5 +434,6 @@@
> 432 common fsmount sys_fsmount
> 433 common fspick sys_fspick
> 434 common pidfd_open sys_pidfd_open
> -# 435 reserved for clone3
> +435 common clone3 __sys_clone3
> + 436 common watch_devices sys_watch_devices
> +437 common openat2 sys_openat2
This is now a conflict between the keys tree and Linus' tree - just a
reminder for pull requests.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-01-27 20:52 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-01-13 1:36 linux-next: manual merge of the keys tree with the m86k tree Stephen Rothwell
2020-01-13 1:37 ` Stephen Rothwell
2020-01-27 20:52 ` Stephen Rothwell
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).