Subject: linux-next: manual merge of the akpm-current tree with the asm-generic tree

From: Stephen Rothwell <[email-masked]>
Date: Thu, 15 Mar 2018 20:00:15 +1100

Hi Andrew,

Today's linux-next merge of the akpm-current tree got a conflict in:

  mm/sparse.c

between commit:

  123d3239fb65 ("mm: remove obsolete alloc_remap()")

from the asm-generic tree and commit:

  9c6a14b65e50 ("mm/sparse.c: optimize memmap allocation during sparse_init()")

from the akpm-current tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc mm/sparse.c
index 65bb52599f90,873617fab5ff..000000000000
--- a/mm/sparse.c
+++ b/mm/sparse.c
@@@ -441,7 -454,21 +450,8 @@@ void __init sparse_mem_maps_populate_no
  	void *map;
  	unsigned long pnum;
  	unsigned long size = sizeof(struct page) * PAGES_PER_SECTION;
+ 	int idx_present;
  
 -	map = alloc_remap(nodeid, size * map_count);
 -	if (map) {
 -		idx_present = 0;
 -		for (pnum = pnum_begin; pnum < pnum_end; pnum++) {
 -			if (!present_section_nr(pnum))
 -				continue;
 -			map_map[idx_present] = map;
 -			map += size;
 -			idx_present++;
 -		}
 -		return;
 -	}
 -
  	size = PAGE_ALIGN(size);
  	map = memblock_virt_alloc_try_nid_raw(size * map_count,
  					      PAGE_SIZE, __pa(MAX_DMA_ADDRESS),