Merge branch 'mm-hotfixes-stable' into mm-stable

diff --cc MAINTAINERS
Simple merge

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

diff --cc mm/gup.c
Simple merge

diff --cc mm/memcontrol.c
Simple merge

diff --cc mm/mmap.c
Simple merge

diff --cc mm/shmem.c
index f418d21205be1e0a6aa88eefcbe09a5c1f9a5e6a,82911fefc2d5e55a539f21ee076e82add4bdcc78..17adb7f6f6e43f535926af8f2df7a1078b1bb3d9
--- 1/mm/shmem.c
--- 2/mm/shmem.c
+++ b/mm/shmem.c
@@@ -948,8 -945,18 +948,17 @@@ static void shmem_undo_range(struct ino
                folio_batch_remove_exceptionals(&fbatch);
                folio_batch_release(&fbatch);
                cond_resched();
 -              index++;
        }
  
+       /*
+        * When undoing a failed fallocate, we want none of the partial folio
+        * zeroing and splitting below, but shall want to truncate the whole
+        * folio when !uptodate indicates that it was added by this fallocate,
+        * even when [lstart, lend] covers only a part of the folio.
+        */
+       if (unfalloc)
+               goto whole_folios;
+ 
        same_folio = (lstart >> PAGE_SHIFT) == (lend >> PAGE_SHIFT);
        folio = shmem_get_partial_folio(inode, lstart >> PAGE_SHIFT);
        if (folio) {