linux-next: manual merge of the uml tree with the mm-stable tree

[Stephen Rothwell]

Hi all,

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

  arch/um/kernel/mem.c

between commits:

  0d98484ee333 ("arch, mm: introduce arch_mm_preinit")
  8afa901c147a ("arch, mm: make releasing of memory to page allocator more explicit")

from the mm-stable tree and commit:

  e82cf3051e61 ("um: Update min_low_pfn to match changes in uml_reserved")

from the uml tree.

I fixed it up (I think - 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 arch/um/kernel/mem.c
index 379f33a1babf,61b5a5ede01c..000000000000
--- a/arch/um/kernel/mem.c
+++ b/arch/um/kernel/mem.c
@@@ -66,11 -68,11 +68,12 @@@ void __init arch_mm_preinit(void
  	map_memory(brk_end, __pa(brk_end), uml_reserved - brk_end, 1, 1, 0);
  	memblock_free((void *)brk_end, uml_reserved - brk_end);
  	uml_reserved = brk_end;
+ 	min_low_pfn = PFN_UP(__pa(uml_reserved));
 -
 -	/* this will put all low memory onto the freelists */
 -	memblock_free_all();
  	max_pfn = max_low_pfn;
 +}
 +
 +void __init mem_init(void)
 +{
  	kmalloc_ok = 1;
  }

Attachment: pgpHD9gts3cf6.pgp
Description: OpenPGP digital signature