[folded-merged] mm-add-zblock-allocator-fix.patch removed from -mm tree

[folded-merged] mm-add-zblock-allocator-fix.patch removed from -mm tree

[Andrew Morton]

The quilt patch titled
     Subject: mm-add-zblock-allocator-fix
has been removed from the -mm tree.  Its filename was
     mm-add-zblock-allocator-fix.patch

This patch was dropped because it was folded into mm-add-zblock-allocator.patch

------------------------------------------------------
From: Andrew Morton <akpm@linux-foundation.org>
Subject: mm-add-zblock-allocator-fix
Date: Tue Apr 15 09:02:06 PM PDT 2025

fix build

Cc: Igor Belousov <igor.b@beldev.am>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Cc: Nhat Pham <nphamcs@gmail.com>
Cc: Shakeel Butt <shakeel.butt@linux.dev>
Cc: Vitaly Wool <vitaly.wool@konsulko.se>
Cc: David Hildenbrand <david@redhat.com>
Cc: Yosry Ahmed <yosry.ahmed@linux.dev>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

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

--- a/mm/zblock.c~mm-add-zblock-allocator-fix
+++ a/mm/zblock.c
@@ -328,7 +328,7 @@ static void zblock_zpool_destroy(void *p
 }
 
 static int zblock_zpool_malloc(void *pool, size_t size, gfp_t gfp,
-			unsigned long *handle)
+			unsigned long *handle, const int nid)
 {
 	return zblock_alloc(pool, size, gfp, handle);
 }
_

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

docs-proc-update-vmflags-documentation-in-smaps-fix.patch
drivers-rapidio-rio_cmc-prevent-possible-used-uninitialized.patch
mm-add-mmap_prepare-compatibility-layer-for-nested-file-systems-fix.patch
mm-add-zblock-allocator.patch
mm-add-zblock-allocator-fix-2.patch
mm-add-zblock-allocator-fix-2-fix.patch
mm-add-zblock-allocator-fix-3.patch
mm-zblock-avoid-failing-the-build-fix.patch