linux-next: manual merge of the tip tree with the FIXME tree

[Mark Brown]

Hi all,

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

  arch/ia64/Kconfig

between commits:

  fc5bad03709f9 ("ia64: remove the hpsim platform")
  cf07cb1ff4ea0 ("ia64: remove support for the SGI SN2 platform")

from the ia64 tree and commit:

  a2cbfd46559e8 ("arch, ia64: Make NUMA select SMP")

from the tip 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.

diff --cc arch/ia64/Kconfig
index 5dbd7fd7578f4,997baba02b70e..0000000000000
--- a/arch/ia64/Kconfig
+++ b/arch/ia64/Kconfig
@@@ -311,7 -386,10 +311,9 @@@ config ARCH_DISCONTIGMEM_DEFAUL
  
  config NUMA
  	bool "NUMA support"
 -	depends on !IA64_HP_SIM && !FLATMEM
 -	default y if IA64_SGI_SN2
 +	depends on !FLATMEM
+ 	select ACPI_NUMA if ACPI
+ 	select SMP
  	help
  	  Say Y to compile the kernel to support NUMA (Non-Uniform Memory
  	  Access).  This option is for configuring high-end multiprocessor

Attachment: signature.asc
Description: PGP signature