Hi Rusty,
Today's linux-next merge of the rr tree got a conflict in
arch/arm/Kconfig between commits 8c56cc8be5b3 ("ARM: 7449/1: use generic
strnlen_user and strncpy_from_user functions") and b9a50f74905a ("ARM:
7450/1: dcache: select DCACHE_WORD_ACCESS for little-endian ARMv6+ CPUs")
from the arm tree and commit 380470027b5c ("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@xxxxxxxxxxxxxxxx
diff --cc arch/arm/Kconfig
index 71257da,af8bf36..0000000
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@@ -45,9 -45,8 +45,11 @@@ config AR
select GENERIC_SMP_IDLE_THREAD
select KTIME_SCALAR
select GENERIC_CLOCKEVENTS_BROADCAST if SMP
+ select GENERIC_STRNCPY_FROM_USER
+ select GENERIC_STRNLEN_USER
+ select DCACHE_WORD_ACCESS if (CPU_V6 || CPU_V6K || CPU_V7) && !CPU_BIG_ENDIAN
+ select HAVE_MOD_ARCH_SPECIFIC if ARM_UNWIND
+ select MODULES_USE_ELF_REL
help
The ARM series is a line of low-power-consumption RISC chip designs
licensed by ARM Ltd and targeted at embedded applications and
Attachment:
pgpTXQRfhQXzs.pgp
Description: PGP signature
