Hi all, Today's linux-next merge of the security tree got conflicts in:
arch/alpha/kernel/syscalls/syscall.tbl
arch/arm/tools/syscall.tbl
arch/arm64/include/asm/unistd.h
arch/arm64/include/asm/unistd32.h
arch/ia64/kernel/syscalls/syscall.tbl
arch/m68k/kernel/syscalls/syscall.tbl
arch/microblaze/kernel/syscalls/syscall.tbl
arch/mips/kernel/syscalls/syscall_n32.tbl
arch/mips/kernel/syscalls/syscall_n64.tbl
arch/mips/kernel/syscalls/syscall_o32.tbl
arch/parisc/kernel/syscalls/syscall.tbl
arch/powerpc/kernel/syscalls/syscall.tbl
arch/s390/kernel/syscalls/syscall.tbl
arch/sh/kernel/syscalls/syscall.tbl
arch/sparc/kernel/syscalls/syscall.tbl
arch/x86/entry/syscalls/syscall_32.tbl
arch/x86/entry/syscalls/syscall_64.tbl
arch/xtensa/kernel/syscalls/syscall.tbl
include/uapi/asm-generic/unistd.h
between commit:
fa8b90070a80 ("quota: wire up quotactl_path")
from the ext3 tree and commit:
818946f8b806 ("arch: Wire up Landlock syscalls")
from the security 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/alpha/kernel/syscalls/syscall.tbl
index c5f7e595adab,0924a3ac7bd9..000000000000
--- a/arch/alpha/kernel/syscalls/syscall.tbl
+++ b/arch/alpha/kernel/syscalls/syscall.tbl
@@@ -482,4 -482,6 +482,7 @@@
550 common process_madvise sys_process_madvise
551 common epoll_pwait2 sys_epoll_pwait2
552 common mount_setattr sys_mount_setattr
-553 common landlock_create_ruleset sys_landlock_create_ruleset
-554 common landlock_add_rule sys_landlock_add_rule
-555 common landlock_restrict_self sys_landlock_restrict_self
+553 common quotactl_path sys_quotactl_path
++554 common landlock_create_ruleset sys_landlock_create_ruleset
++555 common landlock_add_rule sys_landlock_add_rule
++556 common landlock_restrict_self sys_landlock_restrict_self
diff --cc arch/arm/tools/syscall.tbl
index 90cbe207cf3e,dc1134b34cea..000000000000
--- a/arch/arm/tools/syscall.tbl
+++ b/arch/arm/tools/syscall.tbl
@@@ -456,4 -456,6 +456,7 @@@
440 common process_madvise sys_process_madvise
441 common epoll_pwait2 sys_epoll_pwait2
442 common mount_setattr sys_mount_setattr
-443 common landlock_create_ruleset sys_landlock_create_ruleset
-444 common landlock_add_rule sys_landlock_add_rule
-445 common landlock_restrict_self sys_landlock_restrict_self
+443 common quotactl_path sys_quotactl_path
++444 common landlock_create_ruleset sys_landlock_create_ruleset
++445 common landlock_add_rule sys_landlock_add_rule
++446 common landlock_restrict_self sys_landlock_restrict_self
diff --cc arch/arm64/include/asm/unistd.h
index d1f7d35f986e,d1cc2849dc00..000000000000
--- a/arch/arm64/include/asm/unistd.h
+++ b/arch/arm64/include/asm/unistd.h
@@@ -38,7 -38,7 +38,7 @@@
#define __ARM_NR_compat_set_tls (__ARM_NR_COMPAT_BASE + 5)
#define __ARM_NR_COMPAT_END (__ARM_NR_COMPAT_BASE + 0x800)
- #define __NR_compat_syscalls 444
-#define __NR_compat_syscalls 446
++#define __NR_compat_syscalls 447
#endif
#define __ARCH_WANT_SYS_CLONE
diff --cc arch/arm64/include/asm/unistd32.h
index 8361c5138e5f,54e11bce7677..000000000000
--- a/arch/arm64/include/asm/unistd32.h
+++ b/arch/arm64/include/asm/unistd32.h
@@@ -893,8 -893,12 +893,14 @@@ __SYSCALL(__NR_process_madvise, sys_pro
__SYSCALL(__NR_epoll_pwait2, compat_sys_epoll_pwait2)
#define __NR_mount_setattr 442
__SYSCALL(__NR_mount_setattr, sys_mount_setattr)
-#define __NR_landlock_create_ruleset 443
+#define __NR_quotactl_path 443
+__SYSCALL(__NR_quotactl_path, sys_quotactl_path)
++#define __NR_landlock_create_ruleset 444
+ __SYSCALL(__NR_landlock_create_ruleset, sys_landlock_create_ruleset)
-#define __NR_landlock_add_rule 444
++#define __NR_landlock_add_rule 445
+ __SYSCALL(__NR_landlock_add_rule, sys_landlock_add_rule)
-#define __NR_landlock_restrict_self 445
++#define __NR_landlock_restrict_self 446
+ __SYSCALL(__NR_landlock_restrict_self, sys_landlock_restrict_self)
/*
* Please add new compat syscalls above this comment and update
diff --cc arch/ia64/kernel/syscalls/syscall.tbl
index c072cd459bb5,1bb35159561a..000000000000
--- a/arch/ia64/kernel/syscalls/syscall.tbl
+++ b/arch/ia64/kernel/syscalls/syscall.tbl
@@@ -363,4 -363,6 +363,7 @@@
440 common process_madvise sys_process_madvise
441 common epoll_pwait2 sys_epoll_pwait2
442 common mount_setattr sys_mount_setattr
-443 common landlock_create_ruleset sys_landlock_create_ruleset
-444 common landlock_add_rule sys_landlock_add_rule
-445 common landlock_restrict_self sys_landlock_restrict_self
+443 common quotactl_path sys_quotactl_path
++444 common landlock_create_ruleset sys_landlock_create_ruleset
++445 common landlock_add_rule sys_landlock_add_rule
++446 common landlock_restrict_self sys_landlock_restrict_self
diff --cc arch/m68k/kernel/syscalls/syscall.tbl
index 5e9f81073ff4,e06e224523bb..000000000000
--- a/arch/m68k/kernel/syscalls/syscall.tbl
+++ b/arch/m68k/kernel/syscalls/syscall.tbl
@@@ -442,4 -442,6 +442,7 @@@
440 common process_madvise sys_process_madvise
441 common epoll_pwait2 sys_epoll_pwait2
442 common mount_setattr sys_mount_setattr
-443 common landlock_create_ruleset sys_landlock_create_ruleset
-444 common landlock_add_rule sys_landlock_add_rule
-445 common landlock_restrict_self sys_landlock_restrict_self
+443 common quotactl_path sys_quotactl_path
++444 common landlock_create_ruleset sys_landlock_create_ruleset
++445 common landlock_add_rule sys_landlock_add_rule
++446 common landlock_restrict_self sys_landlock_restrict_self
diff --cc arch/microblaze/kernel/syscalls/syscall.tbl
index 8e74d690c64d,9994a43eafb2..000000000000
--- a/arch/microblaze/kernel/syscalls/syscall.tbl
+++ b/arch/microblaze/kernel/syscalls/syscall.tbl
@@@ -448,4 -448,6 +448,7 @@@
440 common process_madvise sys_process_madvise
441 common epoll_pwait2 sys_epoll_pwait2
442 common mount_setattr sys_mount_setattr
-443 common landlock_create_ruleset sys_landlock_create_ruleset
-444 common landlock_add_rule sys_landlock_add_rule
-445 common landlock_restrict_self sys_landlock_restrict_self
+443 common quotactl_path sys_quotactl_path
++444 common landlock_create_ruleset sys_landlock_create_ruleset
++445 common landlock_add_rule sys_landlock_add_rule
++446 common landlock_restrict_self sys_landlock_restrict_self
diff --cc arch/mips/kernel/syscalls/syscall_n32.tbl
index 6f397e56926f,834333d84d3e..000000000000
--- a/arch/mips/kernel/syscalls/syscall_n32.tbl
+++ b/arch/mips/kernel/syscalls/syscall_n32.tbl
@@@ -381,4 -381,6 +381,7 @@@
440 n32 process_madvise sys_process_madvise
441 n32 epoll_pwait2 compat_sys_epoll_pwait2
442 n32 mount_setattr sys_mount_setattr
-443 n32 landlock_create_ruleset sys_landlock_create_ruleset
-444 n32 landlock_add_rule sys_landlock_add_rule
-445 n32 landlock_restrict_self sys_landlock_restrict_self
+443 n32 quotactl_path sys_quotactl_path
++444 n32 landlock_create_ruleset sys_landlock_create_ruleset
++445 n32 landlock_add_rule sys_landlock_add_rule
++446 n32 landlock_restrict_self sys_landlock_restrict_self
diff --cc arch/mips/kernel/syscalls/syscall_n64.tbl
index ab85a357c4fa,935024e0f49b..000000000000
--- a/arch/mips/kernel/syscalls/syscall_n64.tbl
+++ b/arch/mips/kernel/syscalls/syscall_n64.tbl
@@@ -357,4 -357,6 +357,7 @@@
440 n64 process_madvise sys_process_madvise
441 n64 epoll_pwait2 sys_epoll_pwait2
442 n64 mount_setattr sys_mount_setattr
-443 n64 landlock_create_ruleset sys_landlock_create_ruleset
-444 n64 landlock_add_rule sys_landlock_add_rule
-445 n64 landlock_restrict_self sys_landlock_restrict_self
+443 n64 quotactl_path sys_quotactl_path
++444 n64 landlock_create_ruleset sys_landlock_create_ruleset
++445 n64 landlock_add_rule sys_landlock_add_rule
++446 n64 landlock_restrict_self sys_landlock_restrict_self
diff --cc arch/mips/kernel/syscalls/syscall_o32.tbl
index 9c4cd2b40b38,f3f8bea8ce99..000000000000
--- a/arch/mips/kernel/syscalls/syscall_o32.tbl
+++ b/arch/mips/kernel/syscalls/syscall_o32.tbl
@@@ -430,4 -430,6 +430,7 @@@
440 o32 process_madvise sys_process_madvise
441 o32 epoll_pwait2 sys_epoll_pwait2
compat_sys_epoll_pwait2
442 o32 mount_setattr sys_mount_setattr
-443 o32 landlock_create_ruleset sys_landlock_create_ruleset
-444 o32 landlock_add_rule sys_landlock_add_rule
-445 o32 landlock_restrict_self sys_landlock_restrict_self
+443 o32 quotactl_path sys_quotactl_path
++444 o32 landlock_create_ruleset sys_landlock_create_ruleset
++445 o32 landlock_add_rule sys_landlock_add_rule
++446 o32 landlock_restrict_self sys_landlock_restrict_self
diff --cc arch/parisc/kernel/syscalls/syscall.tbl
index 80fba3f7d47b,1bddfeffdebd..000000000000
--- a/arch/parisc/kernel/syscalls/syscall.tbl
+++ b/arch/parisc/kernel/syscalls/syscall.tbl
@@@ -440,4 -440,6 +440,7 @@@
440 common process_madvise sys_process_madvise
441 common epoll_pwait2 sys_epoll_pwait2
compat_sys_epoll_pwait2
442 common mount_setattr sys_mount_setattr
-443 common landlock_create_ruleset sys_landlock_create_ruleset
-444 common landlock_add_rule sys_landlock_add_rule
-445 common landlock_restrict_self sys_landlock_restrict_self
+443 common quotactl_path sys_quotactl_path
++444 common landlock_create_ruleset sys_landlock_create_ruleset
++445 common landlock_add_rule sys_landlock_add_rule
++446 common landlock_restrict_self sys_landlock_restrict_self
diff --cc arch/powerpc/kernel/syscalls/syscall.tbl
index f66f9c9b9d6c,98548b8da879..000000000000
--- a/arch/powerpc/kernel/syscalls/syscall.tbl
+++ b/arch/powerpc/kernel/syscalls/syscall.tbl
@@@ -522,4 -522,6 +522,7 @@@
440 common process_madvise sys_process_madvise
441 common epoll_pwait2 sys_epoll_pwait2
compat_sys_epoll_pwait2
442 common mount_setattr sys_mount_setattr
-443 common landlock_create_ruleset sys_landlock_create_ruleset
-444 common landlock_add_rule sys_landlock_add_rule
-445 common landlock_restrict_self sys_landlock_restrict_self
+443 common quotactl_path sys_quotactl_path
++444 common landlock_create_ruleset sys_landlock_create_ruleset
++445 common landlock_add_rule sys_landlock_add_rule
++446 common landlock_restrict_self sys_landlock_restrict_self
diff --cc arch/s390/kernel/syscalls/syscall.tbl
index a421905c36e8,ecb697fee2f3..000000000000
--- a/arch/s390/kernel/syscalls/syscall.tbl
+++ b/arch/s390/kernel/syscalls/syscall.tbl
@@@ -445,4 -445,6 +445,7 @@@
440 common process_madvise sys_process_madvise
sys_process_madvise
441 common epoll_pwait2 sys_epoll_pwait2
compat_sys_epoll_pwait2
442 common mount_setattr sys_mount_setattr
sys_mount_setattr
-443 common landlock_create_ruleset sys_landlock_create_ruleset
sys_landlock_create_ruleset
-444 common landlock_add_rule sys_landlock_add_rule
sys_landlock_add_rule
-445 common landlock_restrict_self sys_landlock_restrict_self
sys_landlock_restrict_self
+443 common quotactl_path sys_quotactl_path
sys_quotactl_path
++444 common landlock_create_ruleset sys_landlock_create_ruleset
sys_landlock_create_ruleset
++445 common landlock_add_rule sys_landlock_add_rule
sys_landlock_add_rule
++446 common landlock_restrict_self sys_landlock_restrict_self
sys_landlock_restrict_self
diff --cc arch/sh/kernel/syscalls/syscall.tbl
index f68517aaa4f1,440c053eada5..000000000000
--- a/arch/sh/kernel/syscalls/syscall.tbl
+++ b/arch/sh/kernel/syscalls/syscall.tbl
@@@ -445,4 -445,6 +445,7 @@@
440 common process_madvise sys_process_madvise
441 common epoll_pwait2 sys_epoll_pwait2
442 common mount_setattr sys_mount_setattr
-443 common landlock_create_ruleset sys_landlock_create_ruleset
-444 common landlock_add_rule sys_landlock_add_rule
-445 common landlock_restrict_self sys_landlock_restrict_self
+443 common quotactl_path sys_quotactl_path
++444 common landlock_create_ruleset sys_landlock_create_ruleset
++445 common landlock_add_rule sys_landlock_add_rule
++446 common landlock_restrict_self sys_landlock_restrict_self
diff --cc arch/sparc/kernel/syscalls/syscall.tbl
index 3ee82321504d,f5f5d165c8c1..000000000000
--- a/arch/sparc/kernel/syscalls/syscall.tbl
+++ b/arch/sparc/kernel/syscalls/syscall.tbl
@@@ -488,4 -488,6 +488,7 @@@
440 common process_madvise sys_process_madvise
441 common epoll_pwait2 sys_epoll_pwait2
compat_sys_epoll_pwait2
442 common mount_setattr sys_mount_setattr
-443 common landlock_create_ruleset sys_landlock_create_ruleset
-444 common landlock_add_rule sys_landlock_add_rule
-445 common landlock_restrict_self sys_landlock_restrict_self
+443 common quotactl_path sys_quotactl_path
++444 common landlock_create_ruleset sys_landlock_create_ruleset
++445 common landlock_add_rule sys_landlock_add_rule
++446 common landlock_restrict_self sys_landlock_restrict_self
diff --cc arch/x86/entry/syscalls/syscall_32.tbl
index f52a443eede0,995dc5b46dfc..000000000000
--- a/arch/x86/entry/syscalls/syscall_32.tbl
+++ b/arch/x86/entry/syscalls/syscall_32.tbl
@@@ -447,4 -447,6 +447,7 @@@
440 i386 process_madvise sys_process_madvise
441 i386 epoll_pwait2 sys_epoll_pwait2
compat_sys_epoll_pwait2
442 i386 mount_setattr sys_mount_setattr
-443 i386 landlock_create_ruleset sys_landlock_create_ruleset
-444 i386 landlock_add_rule sys_landlock_add_rule
-445 i386 landlock_restrict_self sys_landlock_restrict_self
+443 i386 quotactl_path sys_quotactl_path
++444 i386 landlock_create_ruleset sys_landlock_create_ruleset
++445 i386 landlock_add_rule sys_landlock_add_rule
++446 i386 landlock_restrict_self sys_landlock_restrict_self
diff --cc arch/x86/entry/syscalls/syscall_64.tbl
index 7eb007b8cab5,a5207ee2b67b..000000000000
--- a/arch/x86/entry/syscalls/syscall_64.tbl
+++ b/arch/x86/entry/syscalls/syscall_64.tbl
@@@ -364,7 -364,9 +364,10 @@@
440 common process_madvise sys_process_madvise
441 common epoll_pwait2 sys_epoll_pwait2
442 common mount_setattr sys_mount_setattr
-443 common landlock_create_ruleset sys_landlock_create_ruleset
-444 common landlock_add_rule sys_landlock_add_rule
-445 common landlock_restrict_self sys_landlock_restrict_self
+443 common quotactl_path sys_quotactl_path
++444 common landlock_create_ruleset sys_landlock_create_ruleset
++445 common landlock_add_rule sys_landlock_add_rule
++446 common landlock_restrict_self sys_landlock_restrict_self
#
# Due to a historical design error, certain syscalls are numbered differently
diff --cc arch/xtensa/kernel/syscalls/syscall.tbl
index c71cc45633de,b43b96a862cd..000000000000
--- a/arch/xtensa/kernel/syscalls/syscall.tbl
+++ b/arch/xtensa/kernel/syscalls/syscall.tbl
@@@ -413,4 -413,6 +413,7 @@@
440 common process_madvise sys_process_madvise
441 common epoll_pwait2 sys_epoll_pwait2
442 common mount_setattr sys_mount_setattr
-443 common landlock_create_ruleset sys_landlock_create_ruleset
-444 common landlock_add_rule sys_landlock_add_rule
-445 common landlock_restrict_self sys_landlock_restrict_self
+443 common quotactl_path sys_quotactl_path
++444 common landlock_create_ruleset sys_landlock_create_ruleset
++445 common landlock_add_rule sys_landlock_add_rule
++446 common landlock_restrict_self sys_landlock_restrict_self
diff --cc include/uapi/asm-generic/unistd.h
index 739c839d28fe,02d8d7804a29..000000000000
--- a/include/uapi/asm-generic/unistd.h
+++ b/include/uapi/asm-generic/unistd.h
@@@ -863,11 -863,15 +863,17 @@@ __SYSCALL(__NR_process_madvise, sys_pro
__SC_COMP(__NR_epoll_pwait2, sys_epoll_pwait2, compat_sys_epoll_pwait2)
#define __NR_mount_setattr 442
__SYSCALL(__NR_mount_setattr, sys_mount_setattr)
-#define __NR_landlock_create_ruleset 443
+#define __NR_quotactl_path 443
+__SYSCALL(__NR_quotactl_path, sys_quotactl_path)
++#define __NR_landlock_create_ruleset 444
+ __SYSCALL(__NR_landlock_create_ruleset, sys_landlock_create_ruleset)
-#define __NR_landlock_add_rule 444
++#define __NR_landlock_add_rule 445
+ __SYSCALL(__NR_landlock_add_rule, sys_landlock_add_rule)
-#define __NR_landlock_restrict_self 445
++#define __NR_landlock_restrict_self 446
+ __SYSCALL(__NR_landlock_restrict_self, sys_landlock_restrict_self)
#undef __NR_syscalls
- #define __NR_syscalls 444
-#define __NR_syscalls 446
++#define __NR_syscalls 447
/*
* 32 bit systems traditionally used different
pgpUsD6eE7MKW.pgp
Description: OpenPGP digital signature
