* linux-next: manual merge of the rr tree with the xtensa tree
@ 2012-08-13 0:39 Stephen Rothwell
0 siblings, 0 replies; only message in thread
From: Stephen Rothwell @ 2012-08-13 0:39 UTC (permalink / raw)
To: Rusty Russell
Cc: linux-next, linux-kernel, David Howells, Max Filippov, Chris Zankel
[-- Attachment #1: Type: text/plain, Size: 923 bytes --]
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 sfr@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
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2012-08-13 0:39 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-08-13 0:39 linux-next: manual merge of the rr tree with the xtensa tree Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).