Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android

Conflicts:
	arch/arm/Kconfig

diff --cc arch/Kconfig
Simple merge

diff --cc arch/arm/Kconfig
index d3159ff4de5b4c8698dd7ac5d02ab33dc0d2fb51,51f1775e3adbea19c648036e215ee512e682d1f3..f4a214446b803effdef5447ac0b7497b65353a26
--- 1/arch/arm/Kconfig
--- 2/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@@ -35,7 -35,7 +35,8 @@@ config AR
        select HAVE_ARCH_BITREVERSE if (CPU_32v7M || CPU_32v7) && !CPU_32v6
        select HAVE_ARCH_JUMP_LABEL if !XIP_KERNEL && !CPU_ENDIAN_BE32
        select HAVE_ARCH_KGDB if !CPU_ENDIAN_BE32
 +      select HAVE_ARCH_MMAP_RND_BITS if MMU
+       select HAVE_ARCH_HARDENED_USERCOPY
        select HAVE_ARCH_SECCOMP_FILTER if (AEABI && !OABI_COMPAT)
        select HAVE_ARCH_TRACEHOOK
        select HAVE_BPF_JIT

diff --cc arch/arm64/Kconfig
Simple merge

diff --cc arch/x86/Kconfig
Simple merge

diff --cc security/Kconfig
Simple merge