From 44fc06d68ead86bc5635ce9afd6e50a2f1f884e4 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Thu, 9 Jan 2025 12:51:44 +0100 Subject: [PATCH] move memblock-make-memblock_set_node-also-warn-about-use-.patch to a temp location for now --- queue-6.6/series | 1 - ...k-make-memblock_set_node-also-warn-about-use-.patch | 10 +++------- 2 files changed, 3 insertions(+), 8 deletions(-) rename {queue-6.6 => temp-6.6}/memblock-make-memblock_set_node-also-warn-about-use-.patch (89%) diff --git a/queue-6.6/series b/queue-6.6/series index b174fd259ae..8fa7701b433 100644 --- a/queue-6.6/series +++ b/queue-6.6/series @@ -98,7 +98,6 @@ btrfs-rename-and-export-__btrfs_cow_block.patch btrfs-fix-use-after-free-when-cowing-tree-bock-and-t.patch bluetooth-btusb-add-callback-function-in-btusb-suspe.patch bluetooth-btusb-mediatek-add-callback-function-in-bt.patch -memblock-make-memblock_set_node-also-warn-about-use-.patch crypto-ecc-prevent-ecc_digits_from_bytes-from-readin.patch cleanup-remove-address-space-of-returned-pointer.patch scsi-hisi_sas-fix-a-deadlock-issue-related-to-automa.patch diff --git a/queue-6.6/memblock-make-memblock_set_node-also-warn-about-use-.patch b/temp-6.6/memblock-make-memblock_set_node-also-warn-about-use-.patch similarity index 89% rename from queue-6.6/memblock-make-memblock_set_node-also-warn-about-use-.patch rename to temp-6.6/memblock-make-memblock_set_node-also-warn-about-use-.patch index 6d9ff834019..ab9212f58e7 100644 --- a/queue-6.6/memblock-make-memblock_set_node-also-warn-about-use-.patch +++ b/temp-6.6/memblock-make-memblock_set_node-also-warn-about-use-.patch @@ -35,15 +35,14 @@ Cc: stable@vger.kernel.org Link: https://lore.kernel.org/r/1c8a058c-5365-4f27-a9f1-3aeb7fb3e7b2@suse.com Signed-off-by: Mike Rapoport (IBM) Signed-off-by: Sasha Levin +Signed-off-by: Greg Kroah-Hartman --- - mm/memblock.c | 4 ++++ + mm/memblock.c | 4 ++++ 1 file changed, 4 insertions(+) -diff --git a/mm/memblock.c b/mm/memblock.c -index 87a2b4340ce4..ba64b47b7c3b 100644 --- a/mm/memblock.c +++ b/mm/memblock.c -@@ -1321,6 +1321,10 @@ int __init_memblock memblock_set_node(phys_addr_t base, phys_addr_t size, +@@ -1321,6 +1321,10 @@ int __init_memblock memblock_set_node(ph int start_rgn, end_rgn; int i, ret; @@ -54,6 +53,3 @@ index 87a2b4340ce4..ba64b47b7c3b 100644 ret = memblock_isolate_range(type, base, size, &start_rgn, &end_rgn); if (ret) return ret; --- -2.39.5 - -- 2.47.3