[folded-merged] mm-replace-config_need_multiple_nodes-with-config_numa-fix.patch removed from -mm tree

[folded-merged] mm-replace-config_need_multiple_nodes-with-config_numa-fix.patch removed from -mm tree

[akpm]

The patch titled
     Subject: mm-replace-config_need_multiple_nodes-with-config_numa-fix
has been removed from the -mm tree.  Its filename was
     mm-replace-config_need_multiple_nodes-with-config_numa-fix.patch

This patch was dropped because it was folded into mm-replace-config_need_multiple_nodes-with-config_numa.patch

------------------------------------------------------
From: Mike Rapoport <rppt@linux.ibm.com>
Subject: mm-replace-config_need_multiple_nodes-with-config_numa-fix

Fix arm boot crash

Take into account the change in pgdat_to_phys().

In the long run I think we should get rid of contig_page_data and allocate
NODE_DATA(0) for !NUMA case as well.

Andrew, can you please add this as a fixup to "mm: replace
CONFIG_NEED_MULTIPLE_NODES with CONFIG_NUMA"?

Link: https://lkml.kernel.org/r/YMj9vHhHOiCVN4BF@linux.ibm.com
Reported-by: Naresh Kamboju <naresh.kamboju@linaro.org>
Cc: Will Deacon <will@kernel.org>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Ard Biesheuvel <ardb@kernel.org>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Christophe Leroy <christophe.leroy@csgroup.eu>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

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

--- a/mm/sparse.c~mm-replace-config_need_multiple_nodes-with-config_numa-fix
+++ a/mm/sparse.c
@@ -346,7 +346,7 @@ size_t mem_section_usage_size(void)
 
 static inline phys_addr_t pgdat_to_phys(struct pglist_data *pgdat)
 {
-#ifndef CONFIG_NEED_MULTIPLE_NODES
+#ifndef CONFIG_NUMA
 	return __pa_symbol(pgdat);
 #else
 	return __pa(pgdat);
_

Patches currently in -mm which might be from rppt@linux.ibm.com are

mm-page_alloc-fix-memory-map-initialization-for-descending-nodes.patch
mm-mmzoneh-simplify-is_highmem_idx.patch
alpha-remove-discontigmem-and-numa.patch
arc-update-comment-about-highmem-implementation.patch
arc-remove-support-for-discontigmem.patch
m68k-remove-support-for-discontigmem.patch
mm-remove-config_discontigmem.patch
arch-mm-remove-stale-mentions-of-disconigmem.patch
docs-remove-description-of-discontigmem.patch
mm-replace-config_need_multiple_nodes-with-config_numa.patch
mm-replace-config_flat_node_mem_map-with-config_flatmem.patch
docs-procrst-meminfo-briefly-describe-gaps-in-memory-accounting.patch
include-linux-mmzoneh-add-documentation-for-pfn_valid.patch
memblock-update-initialization-of-reserved-pages.patch
arm64-decouple-check-whether-pfn-is-in-linear-map-from-pfn_valid.patch
arm64-drop-pfn_valid_within-and-simplify-pfn_valid.patch
mmap-make-mlock_future_check-global.patch
riscv-kconfig-make-direct-map-manipulation-options-depend-on-mmu.patch
set_memory-allow-querying-whether-set_direct_map_-is-actually-enabled.patch
mm-introduce-memfd_secret-system-call-to-create-secret-memory-areas.patch
pm-hibernate-disable-when-there-are-active-secretmem-users.patch
arch-mm-wire-up-memfd_secret-system-call-where-relevant.patch
secretmem-test-add-basic-selftest-for-memfd_secret2.patch