Merge tag 'mm-stable-2024-03-13-20-04' of git://git.kernel.org/pub/scm/linux/kernel...

[sfrench/cifs-2.6.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 874f3645bf1776daa231ebd71a1ade76c662449c..3baff9be40e23c1118e2a250a8fe4e511861bc6f 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -5413,6 +5413,7 @@ R:        Muchun Song <muchun.song@linux.dev>
 L:     cgroups@vger.kernel.org
 L:     linux-mm@kvack.org
 S:     Maintained
+F:     include/linux/memcontrol.h
 F:     mm/memcontrol.c
 F:     mm/swap_cgroup.c
 F:     samples/cgroup/*
@@ -14144,15 +14145,24 @@ T:    git git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
 T:     quilt git://git.kernel.org/pub/scm/linux/kernel/git/akpm/25-new
 F:     include/linux/gfp.h
 F:     include/linux/gfp_types.h
+F:     include/linux/memfd.h
+F:     include/linux/memory.h
 F:     include/linux/memory_hotplug.h
+F:     include/linux/memory-tiers.h
+F:     include/linux/mempolicy.h
+F:     include/linux/mempool.h
+F:     include/linux/memremap.h
 F:     include/linux/mm.h
+F:     include/linux/mm_*.h
 F:     include/linux/mmzone.h
+F:     include/linux/mmu_notifier.h
 F:     include/linux/pagewalk.h
 F:     include/linux/rmap.h
 F:     include/trace/events/ksm.h
 F:     mm/
 F:     tools/mm/
 F:     tools/testing/selftests/mm/
+N:     include/linux/page[-_]*
 
 MEMORY MAPPING
 M:     Andrew Morton <akpm@linux-foundation.org>
@@ -24447,6 +24457,7 @@ ZSWAP COMPRESSED SWAP CACHING
 M:     Johannes Weiner <hannes@cmpxchg.org>
 M:     Yosry Ahmed <yosryahmed@google.com>
 M:     Nhat Pham <nphamcs@gmail.com>
+R:     Chengming Zhou <chengming.zhou@linux.dev>
 L:     linux-mm@kvack.org
 S:     Maintained
 F:     Documentation/admin-guide/mm/zswap.rst
@@ -24454,6 +24465,7 @@ F:      include/linux/zpool.h
 F:     include/linux/zswap.h
 F:     mm/zpool.c
 F:     mm/zswap.c
+F:     tools/testing/selftests/cgroup/test_zswap.c
 
 THE REST
 M:     Linus Torvalds <torvalds@linux-foundation.org>