The quilt patch titled
Subject: mm: z3fold: deprecated ZSWAP_ZPOOL_DEFAULT_Z3FOLD as well
has been removed from the -mm tree. Its filename was
mm-z3fold-deprecate-config_z3fold-fix.patch
This patch was dropped because it was folded into mm-z3fold-deprecate-config_z3fold.patch
------------------------------------------------------
From: Arnd Bergmann <arnd@xxxxxxxx>
Subject: mm: z3fold: deprecated ZSWAP_ZPOOL_DEFAULT_Z3FOLD as well
Date: Mon, 9 Sep 2024 20:26:16 +0000
Randconfig builds that use ZSWAP_ZPOOL_DEFAULT_Z3FOLD now cause a harmless
warning:
WARNING: unmet direct dependencies detected for Z3FOLD
Depends on [n]: Z3FOLD_DEPRECATED [=n]
Selected by [y]:
- ZSWAP_ZPOOL_DEFAULT_Z3FOLD [=y] && ZSWAP [=y]
Avoid the warning by selecting Z3FOLD_DEPRECATED instead,
but rename this symbol to ZSWAP_ZPOOL_DEFAULT_Z3FOLD_DEPRECATED
in the process so it no longer automatically gets used with
old defconfigs while still allowing users to select it
manually.
Link: https://lkml.kernel.org/r/20240909202625.1054880-1-arnd@xxxxxxxxxx
Signed-off-by: Arnd Bergmann <arnd@xxxxxxxx>
Cc: Anshuman Khandual <anshuman.khandual@xxxxxxx>
Cc: Chengming Zhou <zhouchengming@xxxxxxxxxxxxx>
Cc: Chris Down <chris@xxxxxxxxxxxxxx>
Cc: David Hildenbrand <david@xxxxxxxxxx>
Cc: Johannes Weiner <hannes@xxxxxxxxxxx>
Cc: Kees Cook <kees@xxxxxxxxxx>
Cc: Matthew Wilcox <willy@xxxxxxxxxxxxx>
Cc: Mike Rapoport <rppt@xxxxxxxxxx>
Cc: Nhat Pham <nphamcs@xxxxxxxxx>
Cc: Peter Xu <peterx@xxxxxxxxxx>
Cc: Vitaly Wool <vitaly.wool@xxxxxxxxxxxx>
Cc: Vlastimil Babka <vbabka@xxxxxxx>
Cc: Yosry Ahmed <yosryahmed@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
mm/Kconfig | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
--- a/mm/Kconfig~mm-z3fold-deprecate-config_z3fold-fix
+++ a/mm/Kconfig
@@ -146,12 +146,15 @@ config ZSWAP_ZPOOL_DEFAULT_ZBUD
help
Use the zbud allocator as the default allocator.
-config ZSWAP_ZPOOL_DEFAULT_Z3FOLD
- bool "z3fold"
- select Z3FOLD
+config ZSWAP_ZPOOL_DEFAULT_Z3FOLD_DEPRECATED
+ bool "z3foldi (DEPRECATED)"
+ select Z3FOLD_DEPRECATED
help
Use the z3fold allocator as the default allocator.
+ Deprecated and scheduled for removal in a few cycles,
+ see CONFIG_Z3FOLD_DEPRECATED.
+
config ZSWAP_ZPOOL_DEFAULT_ZSMALLOC
bool "zsmalloc"
select ZSMALLOC
@@ -163,7 +166,7 @@ config ZSWAP_ZPOOL_DEFAULT
string
depends on ZSWAP
default "zbud" if ZSWAP_ZPOOL_DEFAULT_ZBUD
- default "z3fold" if ZSWAP_ZPOOL_DEFAULT_Z3FOLD
+ default "z3fold" if ZSWAP_ZPOOL_DEFAULT_Z3FOLD_DEPRECATED
default "zsmalloc" if ZSWAP_ZPOOL_DEFAULT_ZSMALLOC
default ""
_
Patches currently in -mm which might be from arnd@xxxxxxxx are
mm-z3fold-deprecate-config_z3fold.patch
