Hi Rusty,
Today's linux-next merge of the rr tree got a conflict in
arch/xtensa/Kconfig between commit 75ad645a6efd ("xtensa: add missing
bits required for pci/quirks.c") from the xtensa tree and commit
d673c23ca730 ("Make most arch asm/module.h files use
asm-generic/module.h") from the rr tree.
Just context changes. I fixed it up (see below) and can carry the fix as
necessary.
--
Cheers,
Stephen Rothwell s...@canb.auug.org.au
diff --cc arch/xtensa/Kconfig
index c161367,516210a..0000000
--- a/arch/xtensa/Kconfig
+++ b/arch/xtensa/Kconfig
@@@ -11,7 -10,7 +11,8 @@@ config XTENS
select HAVE_GENERIC_HARDIRQS
select GENERIC_IRQ_SHOW
select GENERIC_CPU_DEVICES
+ select GENERIC_PCI_IOMAP
+ select MODULES_USE_ELF_RELA
help
Xtensa processors are 32-bit RISC machines designed by Tensilica
primarily for embedded systems. These processors are both
pgpNb2OOyw7Qv.pgp
Description: PGP signature
