Hi Rusty,
Today's linux-next merge of the rr tree got a conflict in
arch/alpha/Kconfig between commit f2db633d301b ("alpha: Use new generic
strncpy_from_user() and strnlen_user()") from Linus' 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 [email protected] diff --cc arch/alpha/Kconfig index 9944ded,e73a1a7..0000000 --- a/arch/alpha/Kconfig +++ b/arch/alpha/Kconfig @@@ -18,8 -18,8 +18,10 @@@ config ALPH select ARCH_HAVE_NMI_SAFE_CMPXCHG select GENERIC_SMP_IDLE_THREAD select GENERIC_CMOS_UPDATE + select GENERIC_STRNCPY_FROM_USER + select GENERIC_STRNLEN_USER + select HAVE_MOD_ARCH_SPECIFIC + select MODULES_USE_ELF_RELA help The Alpha is a 64-bit general-purpose processor designed and marketed by the Digital Equipment Corporation of blessed memory,
pgpIPbWC7tH3m.pgp
Description: PGP signature
