Merge branch 'fs-next' of linux-next

diff --cc MAINTAINERS
Simple merge

diff --cc arch/loongarch/configs/loongson3_defconfig
Simple merge

diff --cc fs/ext4/inode.c
Simple merge

diff --cc fs/fuse/dir.c
Simple merge

diff --cc fs/iomap/buffered-io.c
Simple merge

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

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

diff --cc kernel/pid.c
index e9da1662b882180bb74331cff62df747a3cfacfe,4ac2ce46817fdefff8888681bb5ca3f2676e8add..8c9e3922f541236575e5714c0e3173356573a39d
--- 1/kernel/pid.c
--- 2/kernel/pid.c
+++ b/kernel/pid.c
@@@ -239,14 -233,10 +237,14 @@@ struct pid *alloc_pid(struct pid_namesp
                         * Store a null pointer so find_pid_ns does not find
                         * a partially initialized PID (see below).
                         */
 -                      nr = idr_alloc_cyclic(&tmp->idr, NULL, pid_min,
 -                                            pid_max, GFP_ATOMIC);
 +                      if (likely(!pid_noncyclic))
 +                              nr = idr_alloc_cyclic(&tmp->idr, NULL, pid_min,
 +                                                    pid_max, GFP_ATOMIC);
 +                      else
 +                              nr = idr_alloc(&tmp->idr, NULL, pid_min,
 +                                                    pid_max, GFP_ATOMIC);
                }
-               spin_unlock_irq(&pidmap_lock);
+               spin_unlock(&pidmap_lock);
                idr_preload_end();
  
                if (nr < 0) {

diff --cc lib/Kconfig.debug
Simple merge

diff --cc mm/gup.c
Simple merge

diff --cc net/sunrpc/xprtsock.c
Simple merge

diff --cc tools/testing/selftests/mm/guard-regions.c
index 280d1831bf730fdd8359ac13453c6f081099135d,525c50d3ec238f9663bbdc0d71538edfd274eb1d..b3d0e277109616710e5b1db0c0170651ae790a47
--- 1/tools/testing/selftests/mm/guard-regions.c
--- 2/tools/testing/selftests/mm/guard-pages.c
+++ b/tools/testing/selftests/mm/guard-regions.c
@@@ -19,8 -18,9 +19,10 @@@
  #include <sys/syscall.h>
  #include <sys/uio.h>
  #include <unistd.h>
 +#include "vm_util.h"
  
+ #include "../pidfd/pidfd.h"
+ 
  /*
   * Ignore the checkpatch warning, as per the C99 standard, section 7.14.1.1:
   *
@@@ -525,20 -364,16 +522,16 @@@ TEST_F(guard_regions, multi_vma
   * Assert that batched operations performed using process_madvise() work as
   * expected.
   */
 -TEST_F(guard_pages, process_madvise)
 +TEST_F(guard_regions, process_madvise)
  {
        const unsigned long page_size = self->page_size;
-       pid_t pid = getpid();
-       int pidfd = pidfd_open(pid, 0);
        char *ptr_region, *ptr1, *ptr2, *ptr3;
        ssize_t count;
        struct iovec vec[6];
  
-       ASSERT_NE(pidfd, -1);
- 
        /* Reserve region to map over. */
 -      ptr_region = mmap(NULL, 100 * page_size, PROT_NONE,
 -                        MAP_ANON | MAP_PRIVATE, -1, 0);
 +      ptr_region = mmap_(self, variant, NULL, 100 * page_size,
 +                         PROT_NONE, 0, 0);
        ASSERT_NE(ptr_region, MAP_FAILED);
  
        /*