Merge remote-tracking branch 'notifications/notifications-pipe-core' into master

diff --cc Documentation/watch_queue.rst
Simple merge

diff --cc arch/alpha/kernel/syscalls/syscall.tbl
index ee7b01bb7346c9c57843e68a3fff34ad703601fa,b6cf8403da351a1f4e1faab0a5ccf3b748c74064..c5cc5bfa2062d38518898b5ca4922a2b8c9db51a
--- 1/arch/alpha/kernel/syscalls/syscall.tbl
--- 2/arch/alpha/kernel/syscalls/syscall.tbl
+++ b/arch/alpha/kernel/syscalls/syscall.tbl
@@@ -479,4 -478,4 +479,5 @@@
  547   common  openat2                         sys_openat2
  548   common  pidfd_getfd                     sys_pidfd_getfd
  549   common  faccessat2                      sys_faccessat2
 -550   common  watch_mount                     sys_watch_mount
 +550   common  process_madvise                 sys_process_madvise
++551   common  watch_mount                     sys_watch_mount

diff --cc arch/arm/tools/syscall.tbl
index d056a548358ea024fc64f3a107849951a26838d7,27cc1f53f4a06be2d314945a6b487e115002f90a..47325b3b661afd70f2ede0e235a419254f71b579
--- 1/arch/arm/tools/syscall.tbl
--- 2/arch/arm/tools/syscall.tbl
+++ b/arch/arm/tools/syscall.tbl
@@@ -453,4 -452,4 +453,5 @@@
  437   common  openat2                         sys_openat2
  438   common  pidfd_getfd                     sys_pidfd_getfd
  439   common  faccessat2                      sys_faccessat2
 -440   common  watch_mount                     sys_watch_mount
 +440   common  process_madvise                 sys_process_madvise
++441   common  watch_mount                     sys_watch_mount

diff --cc arch/arm64/include/asm/unistd.h
index b3b2019f8d16bbeef51948c249dcfb6dbd97a0fb,b3b2019f8d16bbeef51948c249dcfb6dbd97a0fb..86a9d7b3eabe9ee254df4abd7f4fd008176d1cf5
--- 1/arch/arm64/include/asm/unistd.h
--- 2/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          441
++#define __NR_compat_syscalls          442
  #endif
  
  #define __ARCH_WANT_SYS_CLONE

diff --cc arch/arm64/include/asm/unistd32.h
index 107f08e03b9fdc4d54b41c7fca707727e1524c92,4f9cf98cdf0fdc014d438fe8213b42fef3332cdc..6c1dcca067e0b098657818d8be2e19029992392f
--- 1/arch/arm64/include/asm/unistd32.h
--- 2/arch/arm64/include/asm/unistd32.h
+++ b/arch/arm64/include/asm/unistd32.h
@@@ -887,8 -885,8 +887,10 @@@ __SYSCALL(__NR_openat2, sys_openat2
  __SYSCALL(__NR_pidfd_getfd, sys_pidfd_getfd)
  #define __NR_faccessat2 439
  __SYSCALL(__NR_faccessat2, sys_faccessat2)
 -#define __NR_watch_mount 440
 +#define __NR_process_madvise 440
 +__SYSCALL(__NR_process_madvise, sys_process_madvise)
++#define __NR_watch_mount 441
+ __SYSCALL(__NR_watch_mount, sys_watch_mount)
  
  /*
   * Please add new compat syscalls above this comment and update

diff --cc arch/ia64/kernel/syscalls/syscall.tbl
index b96ed8b8a508999112a1d8065db035d90efaec0c,fc6d87903781f28fc8c8564aa8cb3f5313b726bf..0332444623501bb261edfafdb6b8e0d332c24643
--- 1/arch/ia64/kernel/syscalls/syscall.tbl
--- 2/arch/ia64/kernel/syscalls/syscall.tbl
+++ b/arch/ia64/kernel/syscalls/syscall.tbl
@@@ -360,4 -359,4 +360,5 @@@
  437   common  openat2                         sys_openat2
  438   common  pidfd_getfd                     sys_pidfd_getfd
  439   common  faccessat2                      sys_faccessat2
 -440   common  watch_mount                     sys_watch_mount
 +440   common  process_madvise                 sys_process_madvise
++441   common  watch_mount                     sys_watch_mount

diff --cc arch/m68k/kernel/syscalls/syscall.tbl
index 625fb6d3284240e0d8bc96556c0b3ff92b350540,c671aa0e4d255a1c39f99b6fd6541c402310f617..efd3ecb3cdfc06ec9d71fde207bcaf1fd95907dd
--- 1/arch/m68k/kernel/syscalls/syscall.tbl
--- 2/arch/m68k/kernel/syscalls/syscall.tbl
+++ b/arch/m68k/kernel/syscalls/syscall.tbl
@@@ -439,4 -438,4 +439,5 @@@
  437   common  openat2                         sys_openat2
  438   common  pidfd_getfd                     sys_pidfd_getfd
  439   common  faccessat2                      sys_faccessat2
 -440   common  watch_mount                     sys_watch_mount
 +440   common  process_madvise                 sys_process_madvise
++441   common  watch_mount                     sys_watch_mount

diff --cc arch/microblaze/kernel/syscalls/syscall.tbl
index aae729c95cf99d23e056c510651c6f3126d4ceff,65cc53f129ef1abe2f44358dd8d506554dd4eb47..67ae5a5e4d213bfad82ddbdaa8c6dae3a28b15bb
--- 1/arch/microblaze/kernel/syscalls/syscall.tbl
--- 2/arch/microblaze/kernel/syscalls/syscall.tbl
+++ b/arch/microblaze/kernel/syscalls/syscall.tbl
@@@ -445,4 -444,4 +445,5 @@@
  437   common  openat2                         sys_openat2
  438   common  pidfd_getfd                     sys_pidfd_getfd
  439   common  faccessat2                      sys_faccessat2
 -440   common  watch_mount                     sys_watch_mount
 +440   common  process_madvise                 sys_process_madvise
++441   common  watch_mount                     sys_watch_mount

diff --cc arch/mips/kernel/syscalls/syscall_n32.tbl
index 32817c954435d7c7dba4a126b35054f18ae0d9ee,7f034a239930c12fb9ff863084296bcc3482b737..c59bc6acc47ac88fc2043e01727f109e27129562
--- 1/arch/mips/kernel/syscalls/syscall_n32.tbl
--- 2/arch/mips/kernel/syscalls/syscall_n32.tbl
+++ b/arch/mips/kernel/syscalls/syscall_n32.tbl
@@@ -378,4 -377,4 +378,5 @@@
  437   n32     openat2                         sys_openat2
  438   n32     pidfd_getfd                     sys_pidfd_getfd
  439   n32     faccessat2                      sys_faccessat2
 -440   n32     watch_mount                     sys_watch_mount
 +440   n32     process_madvise                 sys_process_madvise
++441   n32     watch_mount                     sys_watch_mount

diff --cc arch/mips/kernel/syscalls/syscall_n64.tbl
index 9e4ea3c31b1ce026fdad266866b60be6426d882b,d39b90de3642f86869c6c2c8c76ba94df5f6b073..50bbb95170527668248b42d71bfc850826e8c1be
--- 1/arch/mips/kernel/syscalls/syscall_n64.tbl
--- 2/arch/mips/kernel/syscalls/syscall_n64.tbl
+++ b/arch/mips/kernel/syscalls/syscall_n64.tbl
@@@ -354,4 -353,4 +354,5 @@@
  437   n64     openat2                         sys_openat2
  438   n64     pidfd_getfd                     sys_pidfd_getfd
  439   n64     faccessat2                      sys_faccessat2
 -440   n64     watch_mount                     sys_watch_mount
 +440   n64     process_madvise                 sys_process_madvise
++441   n64     watch_mount                     sys_watch_mount

diff --cc arch/mips/kernel/syscalls/syscall_o32.tbl
index 29f5f28cf5cea83d6119637ea57d40ad6abe4d40,09f426cb45b119ec50b3f42e62699217dfe02e35..1d5644e221b41eb5572813f2457130e2ba8f2ce4
--- 1/arch/mips/kernel/syscalls/syscall_o32.tbl
--- 2/arch/mips/kernel/syscalls/syscall_o32.tbl
+++ b/arch/mips/kernel/syscalls/syscall_o32.tbl
@@@ -427,4 -426,4 +427,5 @@@
  437   o32     openat2                         sys_openat2
  438   o32     pidfd_getfd                     sys_pidfd_getfd
  439   o32     faccessat2                      sys_faccessat2
 -440   o32     watch_mount                     sys_watch_mount
 +440   o32     process_madvise                 sys_process_madvise
++441   o32     watch_mount                     sys_watch_mount

diff --cc arch/parisc/kernel/syscalls/syscall.tbl
index f375ea528e59c34e799e16f9cc9ec8a97cc32fec,52ff3454baa19b1516006f9e74691432d27f3121..4492cc2fce239ebf5cdd871e28fde07fca18cc7c
--- 1/arch/parisc/kernel/syscalls/syscall.tbl
--- 2/arch/parisc/kernel/syscalls/syscall.tbl
+++ b/arch/parisc/kernel/syscalls/syscall.tbl
@@@ -437,4 -436,4 +437,5 @@@
  437   common  openat2                         sys_openat2
  438   common  pidfd_getfd                     sys_pidfd_getfd
  439   common  faccessat2                      sys_faccessat2
 -440   common  watch_mount                     sys_watch_mount
 +440   common  process_madvise                 sys_process_madvise
++441   common  watch_mount                     sys_watch_mount

diff --cc arch/powerpc/kernel/syscalls/syscall.tbl
index 1275daec7fec365024fd50d2b43d42616d829b20,10b7ed3c7a1bdce71215a11d33bd3b8da3538ecc..ee122bfc2ddcf5525988fec31c84f5b9901d6889
--- 1/arch/powerpc/kernel/syscalls/syscall.tbl
--- 2/arch/powerpc/kernel/syscalls/syscall.tbl
+++ b/arch/powerpc/kernel/syscalls/syscall.tbl
@@@ -529,4 -528,4 +529,5 @@@
  437   common  openat2                         sys_openat2
  438   common  pidfd_getfd                     sys_pidfd_getfd
  439   common  faccessat2                      sys_faccessat2
 -440   common  watch_mount                     sys_watch_mount
 +440   common  process_madvise                 sys_process_madvise
++441   common  watch_mount                     sys_watch_mount

diff --cc arch/s390/kernel/syscalls/syscall.tbl
index 28c16800048344821461943d58f99ff1f50ab4c6,86f317bf52dff83d5937c7d6dcba1aeff196f721..b467b57d66d12ed18985dc70484b902e5a73a4e6
--- 1/arch/s390/kernel/syscalls/syscall.tbl
--- 2/arch/s390/kernel/syscalls/syscall.tbl
+++ b/arch/s390/kernel/syscalls/syscall.tbl
@@@ -442,4 -441,4 +442,5 @@@
  437  common   openat2                 sys_openat2                     sys_openat2
  438  common   pidfd_getfd             sys_pidfd_getfd                 sys_pidfd_getfd
  439  common   faccessat2              sys_faccessat2                  sys_faccessat2
 -440   common  watch_mount             sys_watch_mount                 sys_watch_mount
 +440  common   process_madvise         sys_process_madvise             sys_process_madvise
++441   common  watch_mount             sys_watch_mount                 sys_watch_mount

diff --cc arch/sh/kernel/syscalls/syscall.tbl
index 783738448ff555f66baa8d9b559dce0d3e08b325,0bb0f0b372c7a64b166297d8efa0a6982081d15a..f9c7ca5cb969226796e845e60cd68c3c2fcd2acd
--- 1/arch/sh/kernel/syscalls/syscall.tbl
--- 2/arch/sh/kernel/syscalls/syscall.tbl
+++ b/arch/sh/kernel/syscalls/syscall.tbl
@@@ -442,4 -441,4 +442,5 @@@
  437   common  openat2                         sys_openat2
  438   common  pidfd_getfd                     sys_pidfd_getfd
  439   common  faccessat2                      sys_faccessat2
 -440   common  watch_mount                     sys_watch_mount
 +440   common  process_madvise                 sys_process_madvise
++441   common  watch_mount                     sys_watch_mount

diff --cc arch/sparc/kernel/syscalls/syscall.tbl
index 78160260991be726ff888371314cfd10b82d5b6a,369ab65c1e9a67e646e92bb113ce22948f241971..341fd4ba053b0995ee3d8e96e7dceade74ec2cd7
--- 1/arch/sparc/kernel/syscalls/syscall.tbl
--- 2/arch/sparc/kernel/syscalls/syscall.tbl
+++ b/arch/sparc/kernel/syscalls/syscall.tbl
@@@ -485,4 -484,4 +485,5 @@@
  437   common  openat2                 sys_openat2
  438   common  pidfd_getfd                     sys_pidfd_getfd
  439   common  faccessat2                      sys_faccessat2
 -440   common  watch_mount                     sys_watch_mount
 +440   common  process_madvise                 sys_process_madvise
++441   common  watch_mount                     sys_watch_mount

diff --cc arch/x86/entry/syscalls/syscall_32.tbl
index 0d0667a9fbd70aeb9e297342b9f855a457d45ea4,e760ba92c58d22c5b82effffb943b4085a80815d..c52ab1c4a755d13d138b12149c15df0002681470
--- 1/arch/x86/entry/syscalls/syscall_32.tbl
--- 2/arch/x86/entry/syscalls/syscall_32.tbl
+++ b/arch/x86/entry/syscalls/syscall_32.tbl
@@@ -444,4 -443,4 +444,5 @@@
  437   i386    openat2                 sys_openat2
  438   i386    pidfd_getfd             sys_pidfd_getfd
  439   i386    faccessat2              sys_faccessat2
 -440   i386    watch_mount             sys_watch_mount
 +440   i386    process_madvise         sys_process_madvise
++441   i386    watch_mount             sys_watch_mount

diff --cc arch/x86/entry/syscalls/syscall_64.tbl
index 379819244b91d275b2c98f7ff38a59049c24b42a,5b58621d4f75d3b49db66818c7e0c71b0b6234d6..f3270a9ef4678255246e7938bcc609776918c9fa
--- 1/arch/x86/entry/syscalls/syscall_64.tbl
--- 2/arch/x86/entry/syscalls/syscall_64.tbl
+++ b/arch/x86/entry/syscalls/syscall_64.tbl
@@@ -361,13 -360,13 +361,14 @@@
  437   common  openat2                 sys_openat2
  438   common  pidfd_getfd             sys_pidfd_getfd
  439   common  faccessat2              sys_faccessat2
 -440   common  watch_mount             sys_watch_mount
 +440   common  process_madvise         sys_process_madvise
++441   common  watch_mount             sys_watch_mount
  
  #
 -# x32-specific system call numbers start at 512 to avoid cache impact
 -# for native 64-bit operation. The __x32_compat_sys stubs are created
 -# on-the-fly for compat_sys_*() compatibility system calls if X86_X32
 -# is defined.
 +# Due to a historical design error, certain syscalls are numbered differently
 +# in x32 as compared to native x86_64.  These syscalls have numbers 512-547.
 +# Do not add new syscalls to this range.  Numbers 548 and above are available
 +# for non-x32 use.
  #
  512   x32     rt_sigaction            compat_sys_rt_sigaction
  513   x32     rt_sigreturn            compat_sys_x32_rt_sigreturn

diff --cc arch/xtensa/kernel/syscalls/syscall.tbl
index b070f272995d6447895287704a0c76237619c2cc,5b28ee39f70ffd5fc730e608827658726430b49f..6225d87be81fcccdd73cae1e192635f84dbbc651
--- 1/arch/xtensa/kernel/syscalls/syscall.tbl
--- 2/arch/xtensa/kernel/syscalls/syscall.tbl
+++ b/arch/xtensa/kernel/syscalls/syscall.tbl
@@@ -410,4 -409,4 +410,5 @@@
  437   common  openat2                         sys_openat2
  438   common  pidfd_getfd                     sys_pidfd_getfd
  439   common  faccessat2                      sys_faccessat2
 -440   common  watch_mount                     sys_watch_mount
 +440   common  process_madvise                 sys_process_madvise
++441   common  watch_mount                     sys_watch_mount

diff --cc fs/Kconfig
Simple merge

diff --cc fs/Makefile
Simple merge

diff --cc fs/mount.h
index ce6c376e0bc2d9378af90d141d12bf387d9c11b9,85456a5f5a3a5d70e7c2667e08d7214d68647033..84d176c0b37f059936a658297e1f7e7913de299b
--- 1/fs/mount.h
--- 2/fs/mount.h
+++ b/fs/mount.h
@@@ -4,8 -4,10 +4,9 @@@
  #include <linux/poll.h>
  #include <linux/ns_common.h>
  #include <linux/fs_pin.h>
+ #include <linux/watch_queue.h>
  
  struct mnt_namespace {
 -      atomic_t                count;
        struct ns_common        ns;
        struct mount *  root;
        /*

diff --cc fs/namespace.c
Simple merge

diff --cc include/linux/dcache.h
Simple merge

diff --cc include/linux/lsm_hook_defs.h
Simple merge

diff --cc include/linux/lsm_hooks.h
Simple merge

diff --cc include/linux/security.h
Simple merge

diff --cc include/linux/syscalls.h
Simple merge

diff --cc include/linux/watch_queue.h
index c994d1b2cdbaa2abb313170749d0ee396a807a90,38e04c7a7951aad84ab689037d8dedf3528db351..f1086d12cd03f66a3c288761cc2023672a5d9d5a
--- 1/include/linux/watch_queue.h
--- 2/include/linux/watch_queue.h
+++ b/include/linux/watch_queue.h
@@@ -120,14 -120,13 +120,19 @@@ static inline void remove_watch_list(st
   * watch_sizeof - Calculate the information part of the size of a watch record,
   * given the structure size.
   */
- #define watch_sizeof(STRUCT) (sizeof(STRUCT) << WATCH_INFO_LENGTH__SHIFT)
+ #define watch_sizeof(STRUCT) \
+       ({                                                              \
+               size_t max = WATCH_INFO_LENGTH >> WATCH_INFO_LENGTH__SHIFT; \
+               BUILD_BUG_ON(sizeof(STRUCT) > max);                     \
+               sizeof(STRUCT) << WATCH_INFO_LENGTH__SHIFT;             \
+       })
  
 +#else
 +static inline int watch_queue_init(struct pipe_inode_info *pipe)
 +{
 +      return -ENOPKG;
 +}
 +
  #endif
  
  #endif /* _LINUX_WATCH_QUEUE_H */

diff --cc include/uapi/asm-generic/unistd.h
index 2056318988f774931c4e0a3104144bf4a75ff52f,fcdca8c7d30ac84f8d23e6e53027a51f7062d666..5df46517260e5319503ef8560b70efe68a453323
--- 1/include/uapi/asm-generic/unistd.h
--- 2/include/uapi/asm-generic/unistd.h
+++ b/include/uapi/asm-generic/unistd.h
@@@ -857,11 -857,11 +857,13 @@@ __SYSCALL(__NR_openat2, sys_openat2
  __SYSCALL(__NR_pidfd_getfd, sys_pidfd_getfd)
  #define __NR_faccessat2 439
  __SYSCALL(__NR_faccessat2, sys_faccessat2)
 -#define __NR_watch_mount 440
 +#define __NR_process_madvise 440
 +__SYSCALL(__NR_process_madvise, sys_process_madvise)
++#define __NR_watch_mount 441
+ __SYSCALL(__NR_watch_mount, sys_watch_mount)
  
  #undef __NR_syscalls
--#define __NR_syscalls 441
++#define __NR_syscalls 442
  
  /*
   * 32 bit systems traditionally used different

diff --cc kernel/sys_ni.c
Simple merge

diff --cc security/security.c
Simple merge