linux-next: manual merge of the pm tree with the kbuild tree

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

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

Hi all,

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

  arch/arm64/Kconfig

between commits:

  2eac9c2dfb2b ("PCI: consolidate the PCI_DOMAINS and PCI_DOMAINS_GENERIC config options")
  20f1b79d3359 ("PCI: consolidate the PCI_SYSCALL symbol")

from the kbuild tree and commit:

  52146173a033 ("arm64: select ACPI PCI code only when both features are enabled")

from the pm 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/arm64/Kconfig
index 53233ab80744,bcb6262044d8..000000000000
--- a/arch/arm64/Kconfig
+++ b/arch/arm64/Kconfig
@@@ -163,9 -163,7 +163,9 @@@ config ARM6
  	select OF
  	select OF_EARLY_FLATTREE
  	select OF_RESERVED_MEM
 +	select PCI_DOMAINS_GENERIC if PCI
- 	select PCI_ECAM if ACPI
+ 	select PCI_ECAM if (ACPI && PCI)
 +	select PCI_SYSCALL if PCI
  	select POWER_RESET
  	select POWER_SUPPLY
  	select REFCOUNT_FULL

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