From: Mark Brown <broonie@kernel.org>
Date: Sun, 18 Jan 2015 20:50:26 +0000 (+0000)
Subject: Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
X-Git-Tag: firefly_0821_release~3680^2~35
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=22ad963d66fa029662b459d2066017f9c4a99ee9;p=firefly-linux-kernel-4.4.55.git

Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android

Conflicts:
	arch/arm64/include/asm/processor.h
---

22ad963d66fa029662b459d2066017f9c4a99ee9
diff --cc arch/arm64/Kconfig
index 4ff74ee25d61,d64c1a0e9dd0..a1d9fc5ce726
--- a/arch/arm64/Kconfig
+++ b/arch/arm64/Kconfig
@@@ -32,10 -32,9 +33,11 @@@ config ARM6
  	select HARDIRQS_SW_RESEND
  	select HAVE_ARCH_JUMP_LABEL
  	select HAVE_ARCH_KGDB
 +	select HAVE_ARCH_AUDITSYSCALL
 +	select HAVE_ARCH_SECCOMP_FILTER
  	select HAVE_ARCH_TRACEHOOK
  	select HAVE_C_RECORDMCOUNT
+ 	select HAVE_CC_STACKPROTECTOR
  	select HAVE_DEBUG_BUGVERBOSE
  	select HAVE_DEBUG_KMEMLEAK
  	select HAVE_DMA_API_DEBUG