[folded-merged] mm-madvise-minor-cleanup-for-swapin_walk_pmd_entry-fix.patch removed from -mm tree

[folded-merged] mm-madvise-minor-cleanup-for-swapin_walk_pmd_entry-fix.patch removed from -mm tree

[Andrew Morton]

The quilt patch titled
     Subject: mm-madvise-minor-cleanup-for-swapin_walk_pmd_entry-fix
has been removed from the -mm tree.  Its filename was
     mm-madvise-minor-cleanup-for-swapin_walk_pmd_entry-fix.patch

This patch was dropped because it was folded into mm-madvise-minor-cleanup-for-swapin_walk_pmd_entry.patch

------------------------------------------------------
From: Andrew Morton <akpm@linux-foundation.org>
Subject: mm-madvise-minor-cleanup-for-swapin_walk_pmd_entry-fix
Date: Sat Jun 18 11:58:03 AM PDT 2022

reduce scope of `ptep'

Cc: Miaohe Lin <linmiaohe@huawei.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

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

--- a/mm/madvise.c~mm-madvise-minor-cleanup-for-swapin_walk_pmd_entry-fix
+++ a/mm/madvise.c
@@ -195,7 +195,6 @@ success:
 static int swapin_walk_pmd_entry(pmd_t *pmd, unsigned long start,
 	unsigned long end, struct mm_walk *walk)
 {
-	pte_t *ptep;
 	struct vm_area_struct *vma = walk->private;
 	unsigned long index;
 	struct swap_iocb *splug = NULL;
@@ -208,6 +207,7 @@ static int swapin_walk_pmd_entry(pmd_t *
 		swp_entry_t entry;
 		struct page *page;
 		spinlock_t *ptl;
+		pte_t *ptep;
 
 		ptep = pte_offset_map_lock(vma->vm_mm, pmd, index, &ptl);
 		pte = *ptep;
_

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

mm-madvise-minor-cleanup-for-swapin_walk_pmd_entry.patch
mm-docs-fix-comments-that-mention-mem_hotplug_end-fix.patch
android-binder-stop-saving-a-pointer-to-the-vma-fix.patch
mm-remove-the-vma-linked-list-fix-2-fix.patch
mm-drop-oom-code-from-exit_mmap-fix-fix.patch
mm-add-merging-after-mremap-resize-checkpatch-fixes.patch
mm-handling-non-lru-pages-returned-by-vm_normal_pages-fix.patch
mm-factor-helpers-for-memory_failure_dev_pagemap-fix.patch
xfs-support-cow-in-fsdax-mode-fix.patch
mm-thp-kill-transparent_hugepage_active-fix.patch
mm-thp-kill-transparent_hugepage_active-fix-fix.patch
x86-mm-move-protection_map-inside-the-platform-fix.patch