linux-next: manual merge of the fsinfo tree with the vfs tree
From: Stephen Rothwell
Date: Fri May 15 2020 - 06:14:37 EST
Hi all,
Today's linux-next merge of the fsinfo tree got conflicts in:
arch/alpha/kernel/syscalls/syscall.tbl
arch/arm/tools/syscall.tbl
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
between commit:
c8ffd8bcdd28 ("vfs: add faccessat2 syscall")
from the vfs tree and commit:
1b3979fc0f0c ("fsinfo: Add fsinfo() syscall to query filesystem information")
from the fsinfo 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.
I also added the following patch:
From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Date: Fri, 15 May 2020 20:10:32 +1000
Subject: [PATCH] extra syscall updates
Signed-off-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
---
arch/arm64/include/asm/unistd.h | 2 +-
arch/arm64/include/asm/unistd32.h | 2 +-
include/uapi/asm-generic/unistd.h | 4 ++--
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/arch/arm64/include/asm/unistd.h b/arch/arm64/include/asm/unistd.h
index 86a9d7b3eabe..949788f5ba40 100644
--- a/arch/arm64/include/asm/unistd.h
+++ b/arch/arm64/include/asm/unistd.h
@@ -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 442
+#define __NR_compat_syscalls 443
#endif
#define __ARCH_WANT_SYS_CLONE
diff --git a/arch/arm64/include/asm/unistd32.h b/arch/arm64/include/asm/unistd32.h
index a524549e1e6b..d49b63db5b08 100644
--- a/arch/arm64/include/asm/unistd32.h
+++ b/arch/arm64/include/asm/unistd32.h
@@ -889,7 +889,7 @@ __SYSCALL(__NR_faccessat2, sys_faccessat2)
__SYSCALL(__NR_watch_mount, sys_watch_mount)
#define __NR_watch_sb 441
__SYSCALL(__NR_watch_sb, sys_watch_sb)
-#define __NR_fsinfo 441
+#define __NR_fsinfo 442
__SYSCALL(__NR_fsinfo, sys_fsinfo)
/*
diff --git a/include/uapi/asm-generic/unistd.h b/include/uapi/asm-generic/unistd.h
index 4b676c2483f8..9018bb54bfa3 100644
--- a/include/uapi/asm-generic/unistd.h
+++ b/include/uapi/asm-generic/unistd.h
@@ -861,11 +861,11 @@ __SYSCALL(__NR_faccessat2, sys_faccessat2)
__SYSCALL(__NR_watch_mount, sys_watch_mount)
#define __NR_watch_sb 441
__SYSCALL(__NR_watch_sb, sys_watch_sb)
-#define __NR_fsinfo 441
+#define __NR_fsinfo 442
__SYSCALL(__NR_fsinfo, sys_fsinfo)
#undef __NR_syscalls
-#define __NR_syscalls 442
+#define __NR_syscalls 443
/*
* 32 bit systems traditionally used different
--
2.26.2
--
Cheers,
Stephen Rothwell
diff --cc arch/alpha/kernel/syscalls/syscall.tbl
index 0dd59fd28c81,4d0b07dde12d..000000000000
--- a/arch/alpha/kernel/syscalls/syscall.tbl
+++ b/arch/alpha/kernel/syscalls/syscall.tbl
@@@ -477,6 -477,6 +477,7 @@@
# 545 reserved for clone3
547 common openat2 sys_openat2
548 common pidfd_getfd sys_pidfd_getfd
-549 common watch_mount sys_watch_mount
-550 common watch_sb sys_watch_sb
-551 common fsinfo sys_fsinfo
+549 common faccessat2 sys_faccessat2
+550 common watch_mount sys_watch_mount
+551 common watch_sb sys_watch_sb
++552 common fsinfo sys_fsinfo
diff --cc arch/arm/tools/syscall.tbl
index df4aeba36c40,fdda8382b420..000000000000
--- a/arch/arm/tools/syscall.tbl
+++ b/arch/arm/tools/syscall.tbl
@@@ -451,6 -451,6 +451,7 @@@
435 common clone3 sys_clone3
437 common openat2 sys_openat2
438 common pidfd_getfd sys_pidfd_getfd
-439 common watch_mount sys_watch_mount
-440 common watch_sb sys_watch_sb
-441 common fsinfo sys_fsinfo
+439 common faccessat2 sys_faccessat2
+440 common watch_mount sys_watch_mount
+441 common watch_sb sys_watch_sb
++442 common fsinfo sys_fsinfo
diff --cc arch/ia64/kernel/syscalls/syscall.tbl
index 6e12406f2205,2316e60e031a..000000000000
--- a/arch/ia64/kernel/syscalls/syscall.tbl
+++ b/arch/ia64/kernel/syscalls/syscall.tbl
@@@ -358,6 -358,6 +358,7 @@@
# 435 reserved for clone3
437 common openat2 sys_openat2
438 common pidfd_getfd sys_pidfd_getfd
-439 common watch_mount sys_watch_mount
-440 common watch_sb sys_watch_sb
-441 common fsinfo sys_fsinfo
+439 common faccessat2 sys_faccessat2
+440 common watch_mount sys_watch_mount
+441 common watch_sb sys_watch_sb
++442 common fsinfo sys_fsinfo
diff --cc arch/m68k/kernel/syscalls/syscall.tbl
index d6f020ba7c7a,efc2723ca91f..000000000000
--- a/arch/m68k/kernel/syscalls/syscall.tbl
+++ b/arch/m68k/kernel/syscalls/syscall.tbl
@@@ -437,6 -437,6 +437,7 @@@
435 common clone3 __sys_clone3
437 common openat2 sys_openat2
438 common pidfd_getfd sys_pidfd_getfd
-439 common watch_mount sys_watch_mount
-440 common watch_sb sys_watch_sb
-441 common fsinfo sys_fsinfo
+439 common faccessat2 sys_faccessat2
+440 common watch_mount sys_watch_mount
+441 common watch_sb sys_watch_sb
++442 common fsinfo sys_fsinfo
diff --cc arch/microblaze/kernel/syscalls/syscall.tbl
index d3db934ef48a,745c0f462fce..000000000000
--- a/arch/microblaze/kernel/syscalls/syscall.tbl
+++ b/arch/microblaze/kernel/syscalls/syscall.tbl
@@@ -443,6 -443,6 +443,7 @@@
435 common clone3 sys_clone3
437 common openat2 sys_openat2
438 common pidfd_getfd sys_pidfd_getfd
-439 common watch_mount sys_watch_mount
-440 common watch_sb sys_watch_sb
-441 common fsinfo sys_fsinfo
+439 common faccessat2 sys_faccessat2
+440 common watch_mount sys_watch_mount
+441 common watch_sb sys_watch_sb
++442 common fsinfo sys_fsinfo
diff --cc arch/mips/kernel/syscalls/syscall_n32.tbl
index 9a3aad3b0e33,499f83562a8c..000000000000
--- a/arch/mips/kernel/syscalls/syscall_n32.tbl
+++ b/arch/mips/kernel/syscalls/syscall_n32.tbl
@@@ -376,6 -376,6 +376,7 @@@
435 n32 clone3 __sys_clone3
437 n32 openat2 sys_openat2
438 n32 pidfd_getfd sys_pidfd_getfd
-439 n32 watch_mount sys_watch_mount
-440 n32 watch_sb sys_watch_sb
-441 n32 fsinfo sys_fsinfo
+439 n32 faccessat2 sys_faccessat2
+440 n32 watch_mount sys_watch_mount
+441 n32 watch_sb sys_watch_sb
++442 n32 fsinfo sys_fsinfo
diff --cc arch/mips/kernel/syscalls/syscall_n64.tbl
index 430e7c05fea6,b3188bc3ab3c..000000000000
--- a/arch/mips/kernel/syscalls/syscall_n64.tbl
+++ b/arch/mips/kernel/syscalls/syscall_n64.tbl
@@@ -352,6 -352,6 +352,7 @@@
435 n64 clone3 __sys_clone3
437 n64 openat2 sys_openat2
438 n64 pidfd_getfd sys_pidfd_getfd
-439 n64 watch_mount sys_watch_mount
-440 n64 watch_sb sys_watch_sb
-441 n64 fsinfo sys_fsinfo
+439 n64 faccessat2 sys_faccessat2
+440 n64 watch_mount sys_watch_mount
+441 n64 watch_sb sys_watch_sb
++442 n64 fsinfo sys_fsinfo
diff --cc arch/mips/kernel/syscalls/syscall_o32.tbl
index f7404c028e03,1a3e8ed5e538..000000000000
--- a/arch/mips/kernel/syscalls/syscall_o32.tbl
+++ b/arch/mips/kernel/syscalls/syscall_o32.tbl
@@@ -425,6 -425,6 +425,7 @@@
435 o32 clone3 __sys_clone3
437 o32 openat2 sys_openat2
438 o32 pidfd_getfd sys_pidfd_getfd
-439 o32 watch_mount sys_watch_mount
-440 o32 watch_sb sys_watch_sb
-441 o32 fsinfo sys_fsinfo
+439 o32 faccessat2 sys_faccessat2
+440 o32 watch_mount sys_watch_mount
+441 o32 watch_sb sys_watch_sb
++442 o32 fsinfo sys_fsinfo
diff --cc arch/parisc/kernel/syscalls/syscall.tbl
index 9841479242a5,2572c215d861..000000000000
--- a/arch/parisc/kernel/syscalls/syscall.tbl
+++ b/arch/parisc/kernel/syscalls/syscall.tbl
@@@ -435,6 -435,6 +435,7 @@@
435 common clone3 sys_clone3_wrapper
437 common openat2 sys_openat2
438 common pidfd_getfd sys_pidfd_getfd
-439 common watch_mount sys_watch_mount
-440 common watch_sb sys_watch_sb
-441 common fsinfo sys_fsinfo
+439 common faccessat2 sys_faccessat2
+440 common watch_mount sys_watch_mount
+441 common watch_sb sys_watch_sb
++442 common fsinfo sys_fsinfo
diff --cc arch/powerpc/kernel/syscalls/syscall.tbl
index f74b23ba70b2,1f318c68048b..000000000000
--- a/arch/powerpc/kernel/syscalls/syscall.tbl
+++ b/arch/powerpc/kernel/syscalls/syscall.tbl
@@@ -527,6 -527,6 +527,7 @@@
435 spu clone3 sys_ni_syscall
437 common openat2 sys_openat2
438 common pidfd_getfd sys_pidfd_getfd
-439 common watch_mount sys_watch_mount
-440 common watch_sb sys_watch_sb
-441 common fsinfo sys_fsinfo
+439 common faccessat2 sys_faccessat2
+440 common watch_mount sys_watch_mount
+441 common watch_sb sys_watch_sb
++442 common fsinfo sys_fsinfo
diff --cc arch/s390/kernel/syscalls/syscall.tbl
index 0e7fc0a9592b,ae4cefd3dd1b..000000000000
--- a/arch/s390/kernel/syscalls/syscall.tbl
+++ b/arch/s390/kernel/syscalls/syscall.tbl
@@@ -440,6 -440,6 +440,7 @@@
435 common clone3 sys_clone3 sys_clone3
437 common openat2 sys_openat2 sys_openat2
438 common pidfd_getfd sys_pidfd_getfd sys_pidfd_getfd
-439 common watch_mount sys_watch_mount sys_watch_mount
-440 common watch_sb sys_watch_sb sys_watch_sb
-441 common fsinfo sys_fsinfo sys_fsinfo
+439 common faccessat2 sys_faccessat2 sys_faccessat2
+440 common watch_mount sys_watch_mount sys_watch_mount
+441 common watch_sb sys_watch_sb sys_watch_sb
++442 common fsinfo sys_fsinfo sys_fsinfo
diff --cc arch/sh/kernel/syscalls/syscall.tbl
index f283107b9d6b,05945b9aee4b..000000000000
--- a/arch/sh/kernel/syscalls/syscall.tbl
+++ b/arch/sh/kernel/syscalls/syscall.tbl
@@@ -440,6 -440,6 +440,7 @@@
# 435 reserved for clone3
437 common openat2 sys_openat2
438 common pidfd_getfd sys_pidfd_getfd
-439 common watch_mount sys_watch_mount
-440 common watch_sb sys_watch_sb
-441 common fsinfo sys_fsinfo
+439 common faccessat2 sys_faccessat2
+440 common watch_mount sys_watch_mount
+441 common watch_sb sys_watch_sb
++442 common fsinfo sys_fsinfo
diff --cc arch/sparc/kernel/syscalls/syscall.tbl
index 408117c427bd,b71b34d4b45c..000000000000
--- a/arch/sparc/kernel/syscalls/syscall.tbl
+++ b/arch/sparc/kernel/syscalls/syscall.tbl
@@@ -483,6 -483,6 +483,7 @@@
# 435 reserved for clone3
437 common openat2 sys_openat2
438 common pidfd_getfd sys_pidfd_getfd
-439 common watch_mount sys_watch_mount
-440 common watch_sb sys_watch_sb
-441 common fsinfo sys_fsinfo
+439 common faccessat2 sys_faccessat2
+440 common watch_mount sys_watch_mount
+441 common watch_sb sys_watch_sb
++442 common fsinfo sys_fsinfo
diff --cc arch/x86/entry/syscalls/syscall_32.tbl
index 41be37dcb8ea,e26b34e99850..000000000000
--- a/arch/x86/entry/syscalls/syscall_32.tbl
+++ b/arch/x86/entry/syscalls/syscall_32.tbl
@@@ -442,6 -442,6 +442,7 @@@
435 i386 clone3 sys_clone3
437 i386 openat2 sys_openat2
438 i386 pidfd_getfd sys_pidfd_getfd
-439 i386 watch_mount sys_watch_mount
-440 i386 watch_sb sys_watch_sb
-441 i386 fsinfo sys_fsinfo
+439 i386 faccessat2 sys_faccessat2
+440 i386 watch_mount sys_watch_mount
+441 i386 watch_sb sys_watch_sb
++442 i386 fsinfo sys_fsinfo
diff --cc arch/x86/entry/syscalls/syscall_64.tbl
index beb4e906f604,4578b3309c7f..000000000000
--- a/arch/x86/entry/syscalls/syscall_64.tbl
+++ b/arch/x86/entry/syscalls/syscall_64.tbl
@@@ -359,9 -359,9 +359,10 @@@
435 common clone3 sys_clone3
437 common openat2 sys_openat2
438 common pidfd_getfd sys_pidfd_getfd
-439 common watch_mount sys_watch_mount
-440 common watch_sb sys_watch_sb
-441 common fsinfo sys_fsinfo
+439 common faccessat2 sys_faccessat2
+440 common watch_mount sys_watch_mount
+441 common watch_sb sys_watch_sb
++442 common fsinfo sys_fsinfo
#
# x32-specific system call numbers start at 512 to avoid cache impact
diff --cc arch/xtensa/kernel/syscalls/syscall.tbl
index c35d13531382,e1ec25099d10..000000000000
--- a/arch/xtensa/kernel/syscalls/syscall.tbl
+++ b/arch/xtensa/kernel/syscalls/syscall.tbl
@@@ -408,6 -408,6 +408,7 @@@
435 common clone3 sys_clone3
437 common openat2 sys_openat2
438 common pidfd_getfd sys_pidfd_getfd
-439 common watch_mount sys_watch_mount
-440 common watch_sb sys_watch_sb
-441 common fsinfo sys_fsinfo
+439 common faccessat2 sys_faccessat2
+440 common watch_mount sys_watch_mount
+441 common watch_sb sys_watch_sb
++442 common fsinfo sys_fsinfo
Attachment:
pgp8VTyo6bUaq.pgp
Description: OpenPGP digital signature