[folded-merged] zswap-do-not-shrink-if-cgroup-may-not-zswap-fix-fix.patch removed from -mm tree

[Andrew Morton <akpm@linux-foundation.org>]

The quilt patch titled
     Subject: zswap-do-not-shrink-if-cgroup-may-not-zswap-fix-fix
has been removed from the -mm tree.  Its filename was
     zswap-do-not-shrink-if-cgroup-may-not-zswap-fix-fix.patch

This patch was dropped because it was folded into zswap-do-not-shrink-if-cgroup-may-not-zswap.patch

------------------------------------------------------
From: Andrew Morton <akpm@linux-foundation.org>
Subject: zswap-do-not-shrink-if-cgroup-may-not-zswap-fix-fix
Date: Thu Jun  1 01:46:19 PM PDT 2023

s/ENOSPC/ENOMEM/

Cc: Dan Streetman <ddstreet@ieee.org>
Cc: Domenico Cerasuolo <cerasuolodomenico@gmail.com>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Cc: kernel test robot <lkp@intel.com>
Cc: Nhat Pham <nphamcs@gmail.com>
Cc: Seth Jennings <sjenning@redhat.com>
Cc: Vitaly Wool <vitaly.wool@konsulko.com>
Cc: Yosry Ahmed <yosryahmed@google.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 mm/zswap.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- a/mm/zswap.c~zswap-do-not-shrink-if-cgroup-may-not-zswap-fix-fix
+++ a/mm/zswap.c
@@ -1181,7 +1181,7 @@ static int zswap_frontswap_store(unsigne
 	 */
 	objcg = get_obj_cgroup_from_page(page);
 	if (objcg && !obj_cgroup_may_zswap(objcg)) {
-		ret = -ENOSPC;
+		ret = -ENOMEM;
 		goto reject;
 	}
 
_

Patches currently in -mm which might be from akpm@linux-foundation.org are

mm-shmem-fix-race-in-shmem_undo_range-w-thp-fix.patch
zswap-do-not-shrink-if-cgroup-may-not-zswap.patch
mm-compaction-optimize-compact_memory-to-comply-with-the-admin-guide-fix.patch
mm-page_owner-add-page_owner_stacks-file-to-print-out-only-stacks-and-their-counte-fix.patch
mm-page_owner-add-page_owner_stacks-file-to-print-out-only-stacks-and-their-counte-fix-fix.patch
mmpage_owner-filter-out-stacks-by-a-threshold-counter-fix.patch
selftests-mm-gup_longterm-new-functional-test-for-foll_longterm-fix.patch
mm-mlock-rename-mlock_future_check-to-mlock_future_ok.patch
mm-hugetlb-use-a-folio-in-hugetlb_fault-fix.patch
fork-optimize-memcg_charge_kernel_stack-a-bit-fix.patch
squashfs-cache-partial-compressed-blocks-fix.patch
squashfs-cache-partial-compressed-blocks-fix-3-fix.patch
init-add-bdev-fs-printk-if-mount_block_root-failed-fix.patch
kexec-add-helper-__crash_shrink_memory-fix.patch