[folded-merged] lib-test_hmm-check-alloc_page_vma-return-value-and-handle-oom-fix.patch removed from -mm tree

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

The quilt patch titled
     Subject: lib-test_hmm-check-alloc_page_vma-return-value-and-handle-oom-fix
has been removed from the -mm tree.  Its filename was
     lib-test_hmm-check-alloc_page_vma-return-value-and-handle-oom-fix.patch

This patch was dropped because it was folded into lib-test_hmm-check-alloc_page_vma-return-value-and-handle-oom.patch

------------------------------------------------------
From: Andrew Morton <akpm@linux-foundation.org>
Subject: lib-test_hmm-check-alloc_page_vma-return-value-and-handle-oom-fix
Date: Mon Jun  1 05:49:07 PM PDT 2026

fix dmirror_devmem_fault_alloc_and_copy() retval handling

Reported-by: kernel test robot <lkp@intel.com>
Closes: https://lore.kernel.org/oe-kbuild-all/202606011329.zWs2BKy4-lkp@intel.com/
Cc: Alistair Popple <apopple@nvidia.com>
Cc: Jason Gunthorpe <jgg@ziepe.ca>
Cc: Leon Romanovsky <leon@kernel.org>
Cc: Qiang Liu <liuqiang@kylinos.cn>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 lib/test_hmm.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- a/lib/test_hmm.c~lib-test_hmm-check-alloc_page_vma-return-value-and-handle-oom-fix
+++ a/lib/test_hmm.c
@@ -1167,9 +1167,9 @@ static int dmirror_migrate_to_system(str
 			goto out;
 
 		pr_debug("Migrating from device mem to sys mem\n");
-		ret = dmirror_devmem_fault_alloc_and_copy(&args, dmirror);
-		if (ret) {
+		if (dmirror_devmem_fault_alloc_and_copy(&args, dmirror)) {
 			migrate_vma_finalize(&args);
+			ret = -ENOMEM;
 			goto out;
 		}
 
_

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

lib-test_hmm-check-alloc_page_vma-return-value-and-handle-oom.patch
mm-khugepaged-generalize-collapse_huge_page-for-mthp-collapse-fix-2.patch
sparc-add-_mcount-prototype.patch
drivers-media-v4l2-core-v4l2-vp9c-reduce-inlining.patch
security-apparmor-apparmorfsc-conditionally-compile-get_loaddata_common_ref.patch