The quilt patch titled
Subject: MAINTAINERS: supplement of zswap maintainers update
has been removed from the -mm tree. Its filename was
maintainers-supplement-of-zswap-maintainers-update.patch
This patch was dropped because it was merged into the mm-stable branch
of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
------------------------------------------------------
From: Yosry Ahmed <yosryahmed@xxxxxxxxxx>
Subject: MAINTAINERS: supplement of zswap maintainers update
Date: Wed, 17 Jan 2024 18:21:52 +0000
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/
Link: https://lkml.kernel.org/r/20240117182152.1439822-1-yosryahmed@xxxxxxxxxx
Signed-off-by: Yosry Ahmed <yosryahmed@xxxxxxxxxx>
Acked-by: Nhat Pham <nphamcs@xxxxxxxxx>
Acked-by: Dan Streetman <ddstreet@xxxxxxxx>
Acked-by: Seth Jennings <sjenning@xxxxxxxxxx>
Acked-by: Johannes Weiner <hannes@xxxxxxxxxxx>
Cc: Vitaly Wool <vitaly.wool@xxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
CREDITS | 13 +++++++++++++
MAINTAINERS | 9 ++-------
2 files changed, 15 insertions(+), 7 deletions(-)
--- a/CREDITS~maintainers-supplement-of-zswap-maintainers-update
+++ a/CREDITS
@@ -2161,6 +2161,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
--- a/MAINTAINERS~maintainers-supplement-of-zswap-maintainers-update
+++ a/MAINTAINERS
@@ -24341,13 +24341,6 @@ T: git git://git.kernel.org/pub/scm/linu
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
@@ -24399,7 +24392,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
_
Patches currently in -mm which might be from yosryahmed@xxxxxxxxxx are
mm-memcg-optimize-parent-iteration-in-memcg_rstat_updated.patch
mm-swap-enforce-updating-inuse_pages-at-the-end-of-swap_range_free.patch
mm-zswap-remove-unnecessary-trees-cleanups-in-zswap_swapoff.patch
mm-zswap-remove-unused-tree-argument-in-zswap_entry_put.patch
