aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYosry Ahmed <[email protected]>2024-01-17 18:21:52 +0000
committerAndrew Morton <[email protected]>2024-01-25 23:52:21 -0800
commit0fe8ff51efb3fe5cb25da13229f95aa709613cb3 (patch)
treef9d59fdb7a1bc98cf9a564a0e0cee7010845a0b1
parent4434a56ec20925333d6cf4d4093641d063abd35b (diff)
MAINTAINERS: supplement of zswap maintainers update
As discussed on the mailing list [1], merge the zpool maintainers entry into the zswap one. Also, add CREDITS entries for previous zswap/zpool maintainers. [1] https://lore.kernel.org/linux-mm/CAJD7tkYx4YWhGoVwnSeGc8dY_1aRRxxg8PzWBV==A6iqG_OgFw@mail.gmail.com/ Link: https://lkml.kernel.org/r/[email protected] Signed-off-by: Yosry Ahmed <[email protected]> Acked-by: Nhat Pham <[email protected]> Acked-by: Dan Streetman <[email protected]> Acked-by: Seth Jennings <[email protected]> Acked-by: Johannes Weiner <[email protected]> Cc: Vitaly Wool <[email protected]> Signed-off-by: Andrew Morton <[email protected]>
-rw-r--r--CREDITS13
-rw-r--r--MAINTAINERS9
2 files changed, 15 insertions, 7 deletions
diff --git a/CREDITS b/CREDITS
index 5797e8f7e92b..df8d6946739f 100644
--- a/CREDITS
+++ b/CREDITS
@@ -2161,6 +2161,19 @@ N: Mike Kravetz
D: Maintenance and development of the hugetlb subsystem
+N: Seth Jennings
+D: Creation and maintenance of zswap
+
+N: Dan Streetman
+D: Maintenance and development of zswap
+D: Creation and maintenance of the zpool API
+
+N: Vitaly Wool
+D: Maintenance and development of zswap
+
N: Andreas S. Krebs
D: CYPRESS CY82C693 chipset IDE, Digital's PC-Alpha 164SX boards
diff --git a/MAINTAINERS b/MAINTAINERS
index 8c756737491e..fecebfc4c0dc 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -24341,13 +24341,6 @@ T: git git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/zonefs.git
F: Documentation/filesystems/zonefs.rst
F: fs/zonefs/
-ZPOOL COMPRESSED PAGE STORAGE API
-M: Dan Streetman <[email protected]>
-S: Maintained
-F: include/linux/zpool.h
-F: mm/zpool.c
-
ZR36067 VIDEO FOR LINUX DRIVER
M: Corentin Labbe <[email protected]>
@@ -24399,7 +24392,9 @@ M: Nhat Pham <[email protected]>
S: Maintained
F: Documentation/admin-guide/mm/zswap.rst
+F: include/linux/zpool.h
F: include/linux/zswap.h
+F: mm/zpool.c
F: mm/zswap.c
THE REST