[folded-merged] mm-convert-dax-lock-unlock-page-to-lock-unlock-folio-fix.patch removed from -mm tree

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

The quilt patch titled
     Subject: mm-convert-dax-lock-unlock-page-to-lock-unlock-folio-fix
has been removed from the -mm tree.  Its filename was
     mm-convert-dax-lock-unlock-page-to-lock-unlock-folio-fix.patch

This patch was dropped because it was folded into mm-convert-dax-lock-unlock-page-to-lock-unlock-folio.patch

------------------------------------------------------
From: Jane Chu <jane.chu@oracle.com>
Subject: mm-convert-dax-lock-unlock-page-to-lock-unlock-folio-fix
Date: Fri, 8 Sep 2023 16:23:36 -0600

add comment to mf_generic_kill_procss(), simplify
mf_generic_kill_procs:folio initialization.

Link: https://lkml.kernel.org/r/20230908222336.186313-1-jane.chu@oracle.com
Signed-off-by: Jane Chu <jane.chu@oracle.com>
Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
Acked-by: Naoya Horiguchi <naoya.horiguchi@nec.com>
Cc: Dan Williams <dan.j.williams@intel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 mm/memory-failure.c |   12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

--- a/mm/memory-failure.c~mm-convert-dax-lock-unlock-page-to-lock-unlock-folio-fix
+++ a/mm/memory-failure.c
@@ -1713,11 +1713,19 @@ static void unmap_and_kill(struct list_h
 	kill_procs(to_kill, flags & MF_MUST_KILL, false, pfn, flags);
 }
 
+/*
+ * Only dev_pagemap pages get here, such as fsdax when the filesystem
+ * either do not claim or fails to claim a hwpoison event, or devdax.
+ * The fsdax pages are initialized per base page, and the devdax pages
+ * could be initialized either as base pages, or as compound pages with
+ * vmemmap optimization enabled. Devdax is simplistic in its dealing with
+ * hwpoison, such that, if a subpage of a compound page is poisoned,
+ * simply mark the compound head page is by far sufficient.
+ */
 static int mf_generic_kill_procs(unsigned long long pfn, int flags,
 		struct dev_pagemap *pgmap)
 {
-	struct page *page = pfn_to_page(pfn);
-	struct folio *folio = page_folio(page);
+	struct folio *folio = pfn_folio(pfn);
 	LIST_HEAD(to_kill);
 	dax_entry_t cookie;
 	int rc = 0;
_

Patches currently in -mm which might be from jane.chu@oracle.com are

mm-convert-dax-lock-unlock-page-to-lock-unlock-folio.patch