[folded-merged] mm-gup-remove-foll_migration-fix.patch removed from -mm tree

[folded-merged] mm-gup-remove-foll_migration-fix.patch removed from -mm tree

[Andrew Morton]

The quilt patch titled
     Subject: mm-gup-remove-foll_migration-fix
has been removed from the -mm tree.  Its filename was
     mm-gup-remove-foll_migration-fix.patch

This patch was dropped because it was folded into mm-gup-remove-foll_migration.patch

------------------------------------------------------
From: Andrew Morton <akpm@linux-foundation.org>
Subject: mm-gup-remove-foll_migration-fix
Date: Fri Oct 21 03:04:50 PM PDT 2022

fix merge snafu

Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 mm/gup.c |   24 ++----------------------
 1 file changed, 2 insertions(+), 22 deletions(-)

--- a/mm/gup.c~mm-gup-remove-foll_migration-fix
+++ a/mm/gup.c
@@ -651,28 +651,8 @@ static struct page *follow_pmd_mask(stru
 	pmdval = READ_ONCE(*pmd);
 	if (pmd_none(pmdval))
 		return no_page_table(vma, flags);
-retry:
-	if (!pmd_present(pmdval)) {
-		/*
-		 * Should never reach here, if thp migration is not supported;
-		 * Otherwise, it must be a thp migration entry.
-		 */
-		VM_BUG_ON(!thp_migration_supported() ||
-				  !is_pmd_migration_entry(pmdval));
-
-		if (likely(!(flags & FOLL_MIGRATION)))
-			return no_page_table(vma, flags);
-
-		pmd_migration_entry_wait(mm, pmd);
-		pmdval = READ_ONCE(*pmd);
-		/*
-		 * MADV_DONTNEED may convert the pmd to null because
-		 * mmap_lock is held in read mode
-		 */
-		if (pmd_none(pmdval))
-			return no_page_table(vma, flags);
-		goto retry;
-	}
+	if (!pmd_present(pmdval))
+		return no_page_table(vma, flags);
 	if (pmd_devmap(pmdval)) {
 		ptl = pmd_lock(mm, pmd);
 		page = follow_devmap_pmd(vma, address, pmd, flags, &ctx->pgmap);
_

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

mm-gup-remove-foll_migration.patch
fsdax-zero-the-edges-if-source-is-hole-or-unwritten-fix.patch
mm-disable-top-tier-fallback-to-reclaim-on-proactive-reclaim-fix.patch