* linux-next: manual merge of the arm-soc tree with the modules tree
@ 2012-10-04 4:29 Stephen Rothwell
0 siblings, 0 replies; only message in thread
From: Stephen Rothwell @ 2012-10-04 4:29 UTC (permalink / raw)
To: Olof Johansson, Arnd Bergmann, linux-arm-kernel
Cc: linux-next, linux-kernel, Mark Brown, Rusty Russell
[-- Attachment #1: Type: text/plain, Size: 1364 bytes --]
Hi all,
Today's linux-next merge of the arm-soc tree got conflicts in
arch/cris/include/asm/Kbuild, arch/h8300/include/asm/Kbuild and
arch/m32r/include/asm/Kbuild between commit 786d35d45cc4 ("Make most arch
asm/module.h files use asm-generic/module.h") from the modules tree and
commit e7a570ff7dff ("asm-generic: Add default clkdev.h") from the
arm-soc tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc arch/cris/include/asm/Kbuild
index 28b690d,a8eab26..0000000
--- a/arch/cris/include/asm/Kbuild
+++ b/arch/cris/include/asm/Kbuild
@@@ -8,4 -8,4 +8,5 @@@ header-y += etraxgpio.
header-y += rs485.h
header-y += sync_serial.h
+generic-y += module.h
+ generic-y += clkdev.h
diff --cc arch/h8300/include/asm/Kbuild
index 871382d,0e152a9..0000000
--- a/arch/h8300/include/asm/Kbuild
+++ b/arch/h8300/include/asm/Kbuild
@@@ -1,3 -1,3 +1,4 @@@
include include/asm-generic/Kbuild.asm
+generic-y += module.h
+ generic-y += clkdev.h
diff --cc arch/m32r/include/asm/Kbuild
index 871382d,0e152a9..0000000
--- a/arch/m32r/include/asm/Kbuild
+++ b/arch/m32r/include/asm/Kbuild
@@@ -1,3 -1,3 +1,4 @@@
include include/asm-generic/Kbuild.asm
+generic-y += module.h
+ generic-y += clkdev.h
[-- 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-10-04 4:29 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-10-04 4:29 linux-next: manual merge of the arm-soc tree with the modules 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).