[folded-merged] mm-memcg-add-thp-swap-out-info-for-anonymous-reclaim-fix.patch removed from -mm tree

[folded-merged] mm-memcg-add-thp-swap-out-info-for-anonymous-reclaim-fix.patch removed from -mm tree

[Andrew Morton]

The quilt patch titled
     Subject: mm-memcg-add-thp-swap-out-info-for-anonymous-reclaim-fix
has been removed from the -mm tree.  Its filename was
     mm-memcg-add-thp-swap-out-info-for-anonymous-reclaim-fix.patch

This patch was dropped because it was folded into mm-memcg-add-thp-swap-out-info-for-anonymous-reclaim.patch

------------------------------------------------------
From: Andrew Morton <akpm@linux-foundation.org>
Subject: mm-memcg-add-thp-swap-out-info-for-anonymous-reclaim-fix
Date: Wed Sep 13 02:48:29 PM PDT 2023

fix swap_writepage_fs(), per Johannes

Link: https://lkml.kernel.org/r/20230913213343.GB48476@cmpxchg.org
Cc: Johannes Weiner <hannes@cmpxchg.org>
Cc: Michal Hocko <mhocko@suse.com>
Cc: Muchun Song <songmuchun@bytedance.com>
Cc: Roman Gushchin <roman.gushchin@linux.dev>
Cc: Shakeel Butt <shakeelb@google.com>
Cc: Xin Hao <vernhao@tencent.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

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

--- a/mm/page_io.c~mm-memcg-add-thp-swap-out-info-for-anonymous-reclaim-fix
+++ a/mm/page_io.c
@@ -295,7 +295,7 @@ static void swap_writepage_fs(struct pag
 	struct file *swap_file = sis->swap_file;
 	loff_t pos = page_file_offset(page);
 
-	count_swpout_vm_event(page_folio(sio->bvec[p].bv_page));
+	count_swpout_vm_event(page_folio(page));
 	set_page_writeback(page);
 	unlock_page(page);
 	if (wbc->swap_plug)
_

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
mm-memcg-add-thp-swap-out-info-for-anonymous-reclaim.patch
mm-hugetlb-skip-initialization-of-gigantic-tail-struct-pages-if-freed-by-hvo-fix.patch
fs-proc-task_mmu-implement-ioctl-to-get-and-optionally-clear-info-about-ptes-fix.patch
fs-proc-task_mmu-implement-ioctl-to-get-and-optionally-clear-info-about-ptes-fix-fix.patch
fs-proc-task_mmu-implement-ioctl-to-get-and-optionally-clear-info-about-ptes-fix-2.patch
mm-ksm-add-smart-page-scanning-mode-fix.patch
mm-ksm-document-smart-scan-mode-fix.patch
mm-ksm-document-smart-scan-mode-fix-2.patch
mm-kmem-scoped-objcg-protection-checkpatch-fixes.patch
mm-non-pmd-mappable-large-folios-for-folio_add_new_anon_rmap-fix.patch
mm-thp-introduce-anon_orders-and-anon_always_mask-sysfs-files-fix.patch
kthread-add-kthread_stop_put-v2-fix.patch