linux-next: manual merge of the keys tree with the mips-fixes tree

From: Stephen Rothwell
Date: Wed Oct 02 2019 - 20:45:24 EST


Hi all,

Today's linux-next merge of the keys tree got conflicts in:

arch/mips/kernel/syscalls/syscall_n32.tbl
arch/mips/kernel/syscalls/syscall_n64.tbl
arch/mips/kernel/syscalls/syscall_o32.tbl

between commit:

0671c5b84e9e ("MIPS: Wire up clone3 syscall")

from the mips-fixes tree and commit:

e711c800fdba ("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

diff --cc arch/mips/kernel/syscalls/syscall_n32.tbl
index e7c5ab38e403,2ba5b649f0ab..000000000000
--- a/arch/mips/kernel/syscalls/syscall_n32.tbl
+++ b/arch/mips/kernel/syscalls/syscall_n32.tbl
@@@ -373,4 -373,5 +373,5 @@@
432 n32 fsmount sys_fsmount
433 n32 fspick sys_fspick
434 n32 pidfd_open sys_pidfd_open
-# 435 reserved for clone3
+435 n32 clone3 __sys_clone3
+ 436 n32 watch_devices sys_watch_devices
diff --cc arch/mips/kernel/syscalls/syscall_n64.tbl
index 13cd66581f3b,ff350988584d..000000000000
--- a/arch/mips/kernel/syscalls/syscall_n64.tbl
+++ b/arch/mips/kernel/syscalls/syscall_n64.tbl
@@@ -349,4 -349,5 +349,5 @@@
432 n64 fsmount sys_fsmount
433 n64 fspick sys_fspick
434 n64 pidfd_open sys_pidfd_open
-# 435 reserved for clone3
+435 n64 clone3 __sys_clone3
+ 436 n64 watch_devices sys_watch_devices
diff --cc arch/mips/kernel/syscalls/syscall_o32.tbl
index 353539ea4140,7b26bd39900e..000000000000
--- a/arch/mips/kernel/syscalls/syscall_o32.tbl
+++ b/arch/mips/kernel/syscalls/syscall_o32.tbl
@@@ -422,4 -422,5 +422,5 @@@
432 o32 fsmount sys_fsmount
433 o32 fspick sys_fspick
434 o32 pidfd_open sys_pidfd_open
-# 435 reserved for clone3
+435 o32 clone3 __sys_clone3
+ 436 o32 watch_devices sys_watch_devices

Attachment: pgp_J9v6uZN1n.pgp
Description: OpenPGP digital signature