mm-next: manual merge of the akpm/mm-unstable branch

["David Hildenbrand (Arm)" <david@kernel.org>]

Hi,

today's mm-next merge of the akpm/mm-unstable branch tree got a conflict in:

  mm/sparse-vmemmap.c

between the commit:

  063b5e8bbd21 mm: Remove unused exact_nid parameter from memmap_alloc()

from the memblock/for-next branch:

  59cbd435300c mm/sparse-vmemmap: factor out shared vmemmap tail page allocation

from the akpm/mm-unstable branch.

I resolved the conflict manually and will carry the conflict resolution going
forward. "git show --remerge-diff" output for brevity; if people prefer a
different (longer?) output please shout.


diff --git a/mm/sparse-vmemmap.c b/mm/sparse-vmemmap.c
remerge CONFLICT (content): Merge conflict in mm/sparse-vmemmap.c
index a43f1256bf5e..5d7e982f94d0 100644
--- a/mm/sparse-vmemmap.c
+++ b/mm/sparse-vmemmap.c
@@ -36,11 +36,7 @@
 #include "mm_init.h"
 #include "sparse.h"

-<<<<<<< 46c6d937b2c5 (Merge https://git.kernel.org/pub/scm/linux/kernel/git/mm/memblock.git for-next into for-next)
-void * __meminit vmemmap_alloc_block(unsigned long size, int node)
-=======
 void __ref *vmemmap_alloc_block(unsigned long size, int node)
->>>>>>> 1d0b04a60516 (mm: page_alloc: make defrag_mode retries follow the promoted order)
 {
        /* If the main allocator is up use that, fallback to bootmem. */
        if (slab_is_available()) {
@@ -60,11 +56,7 @@ void __ref *vmemmap_alloc_block(unsigned long size, int node)
                }
                return NULL;
        } else
-<<<<<<< 46c6d937b2c5 (Merge https://git.kernel.org/pub/scm/linux/kernel/git/mm/memblock.git for-next into for-next)
                return memmap_alloc(size, size, __pa(MAX_DMA_ADDRESS), node);
-=======
-               return memmap_alloc(size, size, __pa(MAX_DMA_ADDRESS), node, false);
->>>>>>> 1d0b04a60516 (mm: page_alloc: make defrag_mode retries follow the promoted order)
 }

 static void * __meminit altmap_alloc_block_buf(unsigned long size,