[folded-merged] mm-vma-add-and-use-vma__pgoff-fix.patch removed from -mm tree

[folded-merged] mm-vma-add-and-use-vma__pgoff-fix.patch removed from -mm tree

[Andrew Morton]

The quilt patch titled
     Subject: mm-vma-add-and-use-vma__pgoff-fix
has been removed from the -mm tree.  Its filename was
     mm-vma-add-and-use-vma__pgoff-fix.patch

This patch was dropped because it was folded into mm-vma-add-and-use-vma__pgoff.patch

------------------------------------------------------
From: Andrew Morton <akpm@linux-foundation.org>
Subject: mm-vma-add-and-use-vma__pgoff-fix
Date: Fri Jul 17 08:03:43 PM PDT 2026

use linear_page_delta() in __split_vma(), per Vlastimal & Lorenzo

Cc: Ackerley Tng <ackerleytng@google.com>
Cc: David Hildenbrand (Arm) <david@kernel.org>
Cc: Gregory Price <gourry@gourry.net>
Cc: Kai Huang <kai.huang@intel.com>
Cc: Liam R. Howlett (Oracle) <liam@infradead.org>
Cc: Lorenzo Stoakes <ljs@kernel.org>
Cc: Marek Szyprowski <m.szyprowski@samsung.com>
Cc: Pedro Falcato <pfalcato@suse.de>
Cc: SJ Park <sj@kernel.org>
Cc: Thomas Zimmermann <tzimmermann@suse.de>
Cc: Vlastimil Babka (SUSE) <vbabka@kernel.org>
Cc: Zi Yan <ziy@nvidia.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

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

--- a/mm/vma.c~mm-vma-add-and-use-vma__pgoff-fix
+++ a/mm/vma.c
@@ -556,7 +556,7 @@ __split_vma(struct vma_iterator *vmi, st
 
 	if (new_below) {
 		vma->vm_start = addr;
-		vma_add_pgoff(vma, (addr - new->vm_start) >> PAGE_SHIFT);
+		vma_add_pgoff(vma, linear_page_delta(new, addr));
 	} else {
 		vma->vm_end = addr;
 	}
_

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

mm-hmm-make-config_hmm_mirror-select-config_mmu_notifier.patch
mm-vma-add-and-use-vma__pgoff.patch
alloc_tag-add-ioctl-to-proc-allocinfo-fix.patch
mm-page_alloc-only-update-lowmem_reserve_ratio-on-sysctl-write-fix.patch
drivers-media-v4l2-core-v4l2-vp9c-reduce-inlining.patch