[folded-merged] android-binder-stop-saving-a-pointer-to-the-vma-fix.patch removed from -mm tree

[folded-merged] android-binder-stop-saving-a-pointer-to-the-vma-fix.patch removed from -mm tree

[Andrew Morton]

The quilt patch titled
     Subject: android-binder-stop-saving-a-pointer-to-the-vma-fix
has been removed from the -mm tree.  Its filename was
     android-binder-stop-saving-a-pointer-to-the-vma-fix.patch

This patch was dropped because it was folded into android-binder-stop-saving-a-pointer-to-the-vma.patch

------------------------------------------------------
From: Andrew Morton <akpm@linux-foundation.org>
Subject: android-binder-stop-saving-a-pointer-to-the-vma-fix
Date: Tue Jun 21 07:16:17 PM PDT 2022

fix drivers/android/binder_alloc_selftest.c

drivers/android/binder_alloc_selftest.c: In function 'binder_selftest_alloc':
drivers/android/binder_alloc_selftest.c:290:43: error: 'struct binder_alloc' has no member named 'vma'
  290 |         if (!binder_selftest_run || !alloc->vma)


Cc: Christian Brauner (Microsoft) <brauner@kernel.org>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Hridya Valsaraju <hridya@google.com>
Cc: Joel Fernandes <joel@joelfernandes.org>
Cc: "Liam R. Howlett" <Liam.Howlett@oracle.com>
Cc: Martijn Coenen <maco@android.com>
Cc: Matthew Wilcox (Oracle) <willy@infradead.org>
Cc: Minchan Kim <minchan@kernel.org>
Cc: Suren Baghdasaryan <surenb@google.com>
Cc: Todd Kjos <tkjos@android.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 drivers/android/binder_alloc_selftest.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- a/drivers/android/binder_alloc_selftest.c~android-binder-stop-saving-a-pointer-to-the-vma-fix
+++ a/drivers/android/binder_alloc_selftest.c
@@ -287,7 +287,7 @@ void binder_selftest_alloc(struct binder
 	if (!binder_selftest_run)
 		return;
 	mutex_lock(&binder_selftest_lock);
-	if (!binder_selftest_run || !alloc->vma)
+	if (!binder_selftest_run || !alloc->vma_addr)
 		goto done;
 	pr_info("STARTED\n");
 	binder_selftest_alloc_offset(alloc, end_offset, 0);
_

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

android-binder-stop-saving-a-pointer-to-the-vma.patch
mm-shmem-support-fs_ioc_etflags-in-tmpfs-fix.patch