Merge remote-tracking branch 'memblock/memblock-kill-early_node_map'

Conflicts:
	arch/arm/mm/init.c
	arch/score/Kconfig

diff --cc arch/arm/kernel/setup.c
Simple merge

diff --cc arch/arm/mm/init.c
index 786adddf1a86c70cd1087a7341c79b49bf03ca6b,7c38474e533a47c63ac4b78a698f245457a1b7de..e34ea8adc1f928fe8ebeadc677aba06fbd8b4f47
--- 1/arch/arm/mm/init.c
--- 2/arch/arm/mm/init.c
+++ b/arch/arm/mm/init.c
@@@ -310,7 -331,8 +311,6 @@@ void __init arm_memblock_init(struct me
  {
        int i;
  
-       memblock_init();
 -      sort(&meminfo.bank, meminfo.nr_banks, sizeof(meminfo.bank[0]), meminfo_cmp, NULL);
 -
        for (i = 0; i < mi->nr_banks; i++)
                memblock_add(mi->bank[i].start, mi->bank[i].size);
  

diff --cc arch/ia64/Kconfig
Simple merge

diff --cc arch/mips/Kconfig
Simple merge

diff --cc arch/mips/kernel/setup.c
Simple merge

diff --cc arch/powerpc/Kconfig
Simple merge

diff --cc arch/powerpc/mm/mem.c
Simple merge

diff --cc arch/powerpc/mm/numa.c
Simple merge

diff --cc arch/powerpc/mm/tlb_nohash.c
Simple merge

diff --cc arch/s390/Kconfig
Simple merge

diff --cc arch/s390/kernel/setup.c
Simple merge

diff --cc arch/score/Kconfig
index 455ce2d76823eb6c582c30bb3491b3886bbc8276,8b0c9464aa9d10ece5562bad884969665ee6f348..3df65d39abc15f361df4cc61eace374af74e4c17
--- 1/arch/score/Kconfig
--- 2/arch/score/Kconfig
+++ b/arch/score/Kconfig
@@@ -4,7 -4,9 +4,10 @@@ config SCOR
         def_bool y
         select HAVE_GENERIC_HARDIRQS
         select GENERIC_IRQ_SHOW
 +       select GENERIC_IOMAP
+        select HAVE_MEMBLOCK
+        select HAVE_MEMBLOCK_NODE_MAP
+        select ARCH_DISCARD_MEMBLOCK
  
  choice
        prompt "System type"

diff --cc arch/sh/Kconfig
Simple merge

diff --cc arch/sparc/Kconfig
Simple merge

diff --cc arch/x86/Kconfig
Simple merge

diff --cc arch/x86/kernel/e820.c
Simple merge

diff --cc arch/x86/kernel/mpparse.c
Simple merge

diff --cc arch/x86/kernel/setup.c
Simple merge

diff --cc arch/x86/mm/init.c
Simple merge

diff --cc arch/x86/mm/init_32.c
Simple merge

diff --cc arch/x86/mm/init_64.c
Simple merge

diff --cc arch/x86/mm/numa.c
Simple merge

diff --cc arch/x86/platform/efi/efi.c
Simple merge

diff --cc arch/x86/xen/setup.c
Simple merge

diff --cc drivers/iommu/intel-iommu.c
Simple merge

diff --cc include/linux/mm.h
Simple merge

diff --cc kernel/printk.c
Simple merge

diff --cc mm/Kconfig
Simple merge

diff --cc mm/page_alloc.c
Simple merge