From: Alex Shi <alex.shi@linaro.org>
Date: Tue, 30 Aug 2016 02:27:13 +0000 (+0800)
Subject: Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android
X-Git-Tag: firefly_0821_release~176^2~333
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=b56111f481e16510558a892d5d56cb90cadd96c0;p=firefly-linux-kernel-4.4.55.git

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

Conflicts:
	arch/arm/Kconfig
---

b56111f481e16510558a892d5d56cb90cadd96c0
diff --cc arch/arm/Kconfig
index d3159ff4de5b,51f1775e3adb..f4a214446b80
--- a/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