linux-next: manual merge of the akpm tree with the rr tree

From: Stephen Rothwell
Date: Thu Jul 26 2012 - 00:32:58 EST

Hi Andrew,

Today's linux-next merge of the akpm tree got conflicts in
arch/alpha/Kconfig, arch/avr32/Kconfig, arch/blackfin/Kconfig,
arch/cris/Kconfig, arch/h8300/Kconfig, arch/m32r/Kconfig,
arch/m68k/Kconfig, arch/microblaze/Kconfig, arch/mips/Kconfig,
arch/mn10300/Kconfig, arch/powerpc/Kconfig, arch/sh/Kconfig and
arch/sparc/Kconfig between commit 380470027b5c ("Make most arch
asm/module.h files use asm-generic/module.h") from the rr tree and commit
"ipc: use Kconfig options for __ARCH_WANT_[COMPAT_]IPC_PARSE_VERSION"
from the akpm tree.

Just context changes. I fixed it up (see below) and can carry the fix as
necessary.
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx

diff --cc arch/alpha/Kconfig
index 6f580de,1c2172b..0000000
--- a/arch/alpha/Kconfig
+++ b/arch/alpha/Kconfig
@@@ -17,8 -17,7 +17,9 @@@ config ALPH
select ARCH_HAVE_NMI_SAFE_CMPXCHG
select GENERIC_SMP_IDLE_THREAD
select GENERIC_CMOS_UPDATE
+ select HAVE_MOD_ARCH_SPECIFIC
+ select MODULES_USE_ELF_RELA
+ select ARCH_WANT_IPC_PARSE_VERSION
help
The Alpha is a 64-bit general-purpose processor designed and
marketed by the Digital Equipment Corporation of blessed memory,
diff --cc arch/avr32/Kconfig
index 2779913,5602831..0000000
--- a/arch/avr32/Kconfig
+++ b/arch/avr32/Kconfig
@@@ -14,8 -14,7 +14,9 @@@ config AVR3
select ARCH_HAVE_CUSTOM_GPIO_H
select ARCH_HAVE_NMI_SAFE_CMPXCHG
select GENERIC_CLOCKEVENTS
+ select HAVE_MOD_ARCH_SPECIFIC
+ select MODULES_USE_ELF_RELA
+ select ARCH_WANT_IPC_PARSE_VERSION
help
AVR32 is a high-performance 32-bit RISC microprocessor core,
designed for cost-sensitive embedded applications, with particular
diff --cc arch/blackfin/Kconfig
index d8dcd9f,0bc1298..0000000
--- a/arch/blackfin/Kconfig
+++ b/arch/blackfin/Kconfig
@@@ -40,8 -40,7 +40,9 @@@ config BLACKFI
select HAVE_NMI_WATCHDOG if NMI_WATCHDOG
select GENERIC_SMP_IDLE_THREAD
select ARCH_USES_GETTIMEOFFSET if !GENERIC_CLOCKEVENTS
+ select HAVE_MOD_ARCH_SPECIFIC
+ select MODULES_USE_ELF_RELA
+ select ARCH_WANT_IPC_PARSE_VERSION

config GENERIC_CSUM
def_bool y
diff --cc arch/cris/Kconfig
index 67ff98b,253cc2f..0000000
--- a/arch/cris/Kconfig
+++ b/arch/cris/Kconfig
@@@ -46,7 -46,7 +46,8 @@@ config CRI
select GENERIC_IOMAP
select GENERIC_SMP_IDLE_THREAD if ETRAX_ARCH_V32
select GENERIC_CMOS_UPDATE
+ select MODULES_USE_ELF_RELA
+ select ARCH_WANT_IPC_PARSE_VERSION

config HZ
int
diff --cc arch/h8300/Kconfig
index 9eaefdd,82379089..0000000
--- a/arch/h8300/Kconfig
+++ b/arch/h8300/Kconfig
@@@ -5,7 -5,7 +5,8 @@@ config H830
select HAVE_GENERIC_HARDIRQS
select GENERIC_IRQ_SHOW
select GENERIC_CPU_DEVICES
+ select MODULES_USE_ELF_RELA
+ select ARCH_WANT_IPC_PARSE_VERSION

config SYMBOL_PREFIX
string
diff --cc arch/m32r/Kconfig
index a30478e,828e5af..0000000
--- a/arch/m32r/Kconfig
+++ b/arch/m32r/Kconfig
@@@ -12,7 -12,7 +12,8 @@@ config M32
select GENERIC_IRQ_SHOW
select GENERIC_ATOMIC64
select ARCH_USES_GETTIMEOFFSET
+ select MODULES_USE_ELF_RELA
+ select ARCH_WANT_IPC_PARSE_VERSION

config SBUS
bool
diff --cc arch/m68k/Kconfig
index 02fe99e,fd1c1cb..0000000
--- a/arch/m68k/Kconfig
+++ b/arch/m68k/Kconfig
@@@ -11,9 -11,7 +11,10 @@@ config M68
select GENERIC_STRNLEN_USER if MMU
select FPU if MMU
select ARCH_USES_GETTIMEOFFSET if MMU && !COLDFIRE
+ select HAVE_MOD_ARCH_SPECIFIC
+ select MODULES_USE_ELF_REL
+ select MODULES_USE_ELF_RELA
+ select ARCH_WANT_IPC_PARSE_VERSION

config RWSEM_GENERIC_SPINLOCK
bool
diff --cc arch/microblaze/Kconfig
index ee395d3,b5ebd9f..0000000
--- a/arch/microblaze/Kconfig
+++ b/arch/microblaze/Kconfig
@@@ -23,7 -23,7 +23,8 @@@ config MICROBLAZ
select GENERIC_CPU_DEVICES
select GENERIC_ATOMIC64
select GENERIC_CLOCKEVENTS
+ select MODULES_USE_ELF_RELA
+ select ARCH_WANT_IPC_PARSE_VERSION

config SWAP
def_bool n
diff --cc arch/mips/Kconfig
index ce65880,6c71388..0000000
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@@ -35,9 -35,7 +35,10 @@@ config MIP
select BUILDTIME_EXTABLE_SORT
select GENERIC_CLOCKEVENTS
select GENERIC_CMOS_UPDATE
+ select HAVE_MOD_ARCH_SPECIFIC
+ select MODULES_USE_ELF_REL
+ select MODULES_USE_ELF_RELA if 64BIT
+ select ARCH_WANT_IPC_PARSE_VERSION

menu "Machine selection"

diff --cc arch/mn10300/Kconfig
index f8fec1c,17f0ada..0000000
--- a/arch/mn10300/Kconfig
+++ b/arch/mn10300/Kconfig
@@@ -7,7 -7,7 +7,8 @@@ config MN1030
select HAVE_ARCH_KGDB
select HAVE_NMI_WATCHDOG if MN10300_WD_TIMER
select GENERIC_CLOCKEVENTS
+ select MODULES_USE_ELF_RELA
+ select ARCH_WANT_IPC_PARSE_VERSION

config AM33_2
def_bool n
diff --cc arch/powerpc/Kconfig
index 68d76dd,a47089f..0000000
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@@ -138,8 -138,7 +138,9 @@@ config PP
select GENERIC_CLOCKEVENTS
select GENERIC_STRNCPY_FROM_USER
select GENERIC_STRNLEN_USER
+ select HAVE_MOD_ARCH_SPECIFIC
+ select MODULES_USE_ELF_RELA
+ select ARCH_WANT_IPC_PARSE_VERSION

config EARLY_PRINTK
bool
diff --cc arch/sh/Kconfig
index 365ecf5,b1ad435..0000000
--- a/arch/sh/Kconfig
+++ b/arch/sh/Kconfig
@@@ -34,8 -34,7 +34,9 @@@ config SUPER
select GENERIC_CMOS_UPDATE if SH_SH03 || SH_DREAMCAST
select GENERIC_STRNCPY_FROM_USER
select GENERIC_STRNLEN_USER
+ select HAVE_MOD_ARCH_SPECIFIC if DWARF_UNWINDER
+ select MODULES_USE_ELF_RELA
+ select ARCH_WANT_IPC_PARSE_VERSION
help
The SuperH is a RISC processor targeted for use in embedded systems
and consumer electronics; it was also used in the Sega Dreamcast
diff --cc arch/sparc/Kconfig
index acf5577,9245798..0000000
--- a/arch/sparc/Kconfig
+++ b/arch/sparc/Kconfig
@@@ -36,7 -36,7 +36,8 @@@ config SPAR
select GENERIC_CLOCKEVENTS
select GENERIC_STRNCPY_FROM_USER
select GENERIC_STRNLEN_USER
+ select MODULES_USE_ELF_RELA
+ select ARCH_WANT_IPC_PARSE_VERSION

config SPARC32
def_bool !64BIT

Attachment: pgp00000.pgp
Description: PGP signature