[merged mm-stable] vma_merge-set-vma-iterator-to-correct-position.patch removed from -mm tree

[merged mm-stable] vma_merge-set-vma-iterator-to-correct-position.patch removed from -mm tree

[Andrew Morton]

The quilt patch titled
     Subject: vma_merge: set vma iterator to correct position.
has been removed from the -mm tree.  Its filename was
     vma_merge-set-vma-iterator-to-correct-position.patch

This patch was dropped because it was merged into the mm-stable branch
of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm

------------------------------------------------------
From: "Liam R. Howlett" <Liam.Howlett@Oracle.com>
Subject: vma_merge: set vma iterator to correct position.
Date: Fri, 20 Jan 2023 11:26:50 -0500

When merging the previous value, set the vma iterator to the previous
slot.  Don't use the vma iterator to get the next/prev so that it is in
the correct position for a write.

Link: https://lkml.kernel.org/r/20230120162650.984577-50-Liam.Howlett@oracle.com
Signed-off-by: Liam R. Howlett <Liam.Howlett@oracle.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 mm/mmap.c |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

--- a/mm/mmap.c~vma_merge-set-vma-iterator-to-correct-position
+++ a/mm/mmap.c
@@ -932,6 +932,7 @@ struct vm_area_struct *vma_merge(struct
 		    && can_vma_merge_after(prev, vm_flags, anon_vma, file,
 				   pgoff, vm_userfaultfd_ctx, anon_name)) {
 			merge_prev = true;
+			vma_prev(vmi);
 		}
 	}
 	/* Can we merge the successor? */
@@ -1023,9 +1024,6 @@ struct vm_area_struct *vma_merge(struct
 	validate_mm(mm);
 	khugepaged_enter_vma(res, vm_flags);
 
-	if (res)
-		vma_iter_set(vmi, end);
-
 	return res;
 }
 
_

Patches currently in -mm which might be from Liam.Howlett@Oracle.com are