linux-next: manual merge of the akpm-current tree with Linus' tree

[Stephen Rothwell]

Hi Andrew,

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

  mm/page_alloc.c

between commit:

  3e04040df6d4 ("Revert "mm/page_alloc: fix memmap_init_zone pageblock alignment"")

from Linus' tree and commit:

  45251b0909dc ("mm: remove unused arg from memblock_next_valid_pfn()")

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/page_alloc.c
index b32488f10a46,3f9cb47974ed..000000000000
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@@ -5361,9 -5487,14 +5489,9 @@@ void __meminit memmap_init_zone(unsigne
  			/*
  			 * Skip to the pfn preceding the next valid one (or
  			 * end_pfn), such that we hit a valid pfn (or end_pfn)
 -			 * on our next iteration of the loop. Note that it needs
 -			 * to be pageblock aligned even when the region itself
 -			 * is not. move_freepages_block() can shift ahead of
 -			 * the valid region but still depends on correct page
 -			 * metadata.
 +			 * on our next iteration of the loop.
  			 */
- 			pfn = memblock_next_valid_pfn(pfn, end_pfn) - 1;
 -			pfn = (memblock_next_valid_pfn(pfn) &
 -					~(pageblock_nr_pages-1)) - 1;
++			pfn = memblock_next_valid_pfn(pfn) - 1;
  #endif
  			continue;
  		}

Attachment: pgphA7gLgK_Kf.pgp
Description: OpenPGP digital signature