linux-next: manual merge of the arm-soc tree with the kbuild tree

[Stephen Rothwell]

Hi all,

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

  arch/arm/mach-socfpga/Kconfig

between commit:

  2eac9c2dfb2b ("PCI: consolidate the PCI_DOMAINS and PCI_DOMAINS_GENERIC config options")

from the kbuild tree and commit:

  fbc125afdc50 ("ARM: socfpga: Turn on ARM errata for L2 cache")

from the arm-soc tree.

I fixed it up (see below - I also resorted the select lines since they
seemed to be so before the former latter commit) 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/arm/mach-socfpga/Kconfig
index d43798defdba,a04660918d71..000000000000
--- a/arch/arm/mach-socfpga/Kconfig
+++ b/arch/arm/mach-socfpga/Kconfig
@@@ -3,6 -3,6 +3,9 @@@ menuconfig ARCH_SOCFPG
  	depends on ARCH_MULTI_V7
  	select ARCH_SUPPORTS_BIG_ENDIAN
  	select ARM_AMBA
++	select ARM_ERRATA_754322
++	select ARM_ERRATA_764369 if SMP
++	select ARM_ERRATA_775420
  	select ARM_GIC
  	select CACHE_L2X0
  	select DW_APB_TIMER_OF
@@@ -10,7 -10,14 +13,11 @@@
  	select HAVE_ARM_SCU
  	select HAVE_ARM_TWD if SMP
  	select MFD_SYSCON
 -	select PCI_DOMAINS if PCI
 -	select ARM_ERRATA_754322
 -	select ARM_ERRATA_764369 if SMP
 -	select ARM_ERRATA_775420
 +	select PCI_DOMAINS_GENERIC if PCI
+ 	select PL310_ERRATA_588369
+ 	select PL310_ERRATA_727915
+ 	select PL310_ERRATA_753970 if PL310
+ 	select PL310_ERRATA_769419
  
  if ARCH_SOCFPGA
  config SOCFPGA_SUSPEND

Attachment: pgpwttrnjC5hK.pgp
Description: OpenPGP digital signature