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@xxxxxxxxxxxxxx/ Signed-off-by: Yosry Ahmed <yosryahmed@xxxxxxxxxx> --- CREDITS | 13 +++++++++++++ MAINTAINERS | 9 ++------- 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/CREDITS b/CREDITS index d61ba9b5117f1..e7284f391ace0 100644 --- a/CREDITS +++ b/CREDITS @@ -2137,6 +2137,19 @@ N: Mike Kravetz E: mike.kravetz@xxxxxxxxxx D: Maintenance and development of the hugetlb subsystem +N: Seth Jennings +E: sjenning@xxxxxxxxxx +D: Creation and maintenance of zswap + +N: Dan Streetman +E: ddstreet@xxxxxxxx +D: Maintenance and development of zswap +D: Creation and maintenance of the zpool API + +N: Vitaly Wool +E: vitaly.wool@xxxxxxxxxxxx +D: Maintenance and development of zswap + N: Andreas S. Krebs E: akrebs@xxxxxxxxxxxxx D: CYPRESS CY82C693 chipset IDE, Digital's PC-Alpha 164SX boards diff --git a/MAINTAINERS b/MAINTAINERS index a1b31c4c29697..6e95668c4d0a8 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -24102,13 +24102,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 <ddstreet@xxxxxxxx> -L: linux-mm@xxxxxxxxx -S: Maintained -F: include/linux/zpool.h -F: mm/zpool.c - ZR36067 VIDEO FOR LINUX DRIVER M: Corentin Labbe <clabbe@xxxxxxxxxxxx> L: mjpeg-users@xxxxxxxxxxxxxxxxxxxxx @@ -24160,7 +24153,9 @@ M: Nhat Pham <nphamcs@xxxxxxxxx> L: linux-mm@xxxxxxxxx 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 -- 2.43.0.381.gb435a96ce8-goog
