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

[Stephen Rothwell <sfr@canb.auug.org.au>]

[-- Attachment #1: Type: text/plain, Size: 2413 bytes --]

Hi all,

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

  arch/powerpc/mm/mem.c

between commit:

  f172acbfae1a ("powerpc/mm: move warning from resize_hpt_for_hotplug()")
  26ad26718dfa ("powerpc/mm: Fix section mismatch warning")

from the powerpc tree and commit:

  fc6a586376ab ("mm, memory_hotplug: provide a more generic restrictions for memory hotplug")
  e8b6bc564e97 ("mm/memory_hotplug: make __remove_pages() and arch_remove_memory() never fail")

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 arch/powerpc/mm/mem.c
index e12bec98366f,cc9425fb9056..000000000000
--- a/arch/powerpc/mm/mem.c
+++ b/arch/powerpc/mm/mem.c
@@@ -109,8 -109,8 +109,8 @@@ int __weak remove_section_mapping(unsig
  	return -ENODEV;
  }
  
- int __ref arch_add_memory(int nid, u64 start, u64 size, struct vmem_altmap *altmap,
- 			  bool want_memblock)
 -int __meminit arch_add_memory(int nid, u64 start, u64 size,
 -			struct mhp_restrictions *restrictions)
++int __ref arch_add_memory(int nid, u64 start, u64 size,
++			  struct mhp_restrictions *restrictions)
  {
  	unsigned long start_pfn = start >> PAGE_SHIFT;
  	unsigned long nr_pages = size >> PAGE_SHIFT;
@@@ -131,8 -131,8 +131,8 @@@
  }
  
  #ifdef CONFIG_MEMORY_HOTREMOVE
- int __ref arch_remove_memory(int nid, u64 start, u64 size,
- 			     struct vmem_altmap *altmap)
 -void __meminit arch_remove_memory(int nid, u64 start, u64 size,
 -				  struct vmem_altmap *altmap)
++void __ref arch_remove_memory(int nid, u64 start, u64 size,
++			      struct vmem_altmap *altmap)
  {
  	unsigned long start_pfn = start >> PAGE_SHIFT;
  	unsigned long nr_pages = size >> PAGE_SHIFT;
@@@ -161,10 -160,7 +160,8 @@@
  	 */
  	vm_unmap_aliases();
  
 -	resize_hpt_for_hotplug(memblock_phys_mem_size());
 +	if (resize_hpt_for_hotplug(memblock_phys_mem_size()) == -ENOSPC)
 +		pr_warn("Hash collision while resizing HPT\n");
- 
- 	return ret;
  }
  #endif
  #endif /* CONFIG_MEMORY_HOTPLUG */

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]