Hi all, Today's linux-next merge of the kbuild tree got a conflict in:
arch/mips/ralink/Kconfig
between commit:
0b15394475e3 ("MIPS: ralink: Select CONFIG_CPU_MIPSR2_IRQ_VI on MT7620/8")
from the mips-fixes tree and commit:
eb01d42a7778 ("PCI: consolidate PCI config entry in drivers/pci")
from the kbuild 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/mips/ralink/Kconfig
index 613d61763433,4c8006b4a5f7..000000000000
--- a/arch/mips/ralink/Kconfig
+++ b/arch/mips/ralink/Kconfig
@@@ -38,8 -38,7 +38,8 @@@ choic
config SOC_MT7620
bool "MT7620/8"
+ select CPU_MIPSR2_IRQ_VI
- select HW_HAS_PCI
+ select HAVE_PCI
config SOC_MT7621
bool "MT7621"
pgpxYLdmx_j9t.pgp
Description: OpenPGP digital signature
