* linux-next: manual merge of the audit tree with arch trees
@ 2014-03-12 21:27 Mark Brown
0 siblings, 0 replies; only message in thread
From: Mark Brown @ 2014-03-12 21:27 UTC (permalink / raw)
To: Eric Paris, AKASHI Takahiro; +Cc: linux-next, linux-kernel
[-- Attachment #1: Type: text/plain, Size: 1164 bytes --]
Hi Eric,
Today's linux-next merge of the audit tree got conflicts between context changes in various arch trees and commit b4df597ae51f820 ("audit: Add CONFIG_HAVE_ARCH_AUDITSYSCALL") from the audit tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
diff --cc arch/powerpc/Kconfig
index 957d3e5aff9e,96627d67bd67..000000000000
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@@ -140,7 -139,7 +140,8 @@@ config PP
select OLD_SIGACTION if PPC32
select HAVE_DEBUG_STACKOVERFLOW
select HAVE_IRQ_EXIT_ON_IRQ_STACK
+ select ARCH_USE_CMPXCHG_LOCKREF if PPC64
+ select HAVE_ARCH_AUDITSYSCALL
config GENERIC_CSUM
def_bool CPU_LITTLE_ENDIAN
diff --cc arch/x86/Kconfig
index 0af5250d914f,56f47caf6fa0..000000000000
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@@ -126,7 -125,7 +126,8 @@@ config X8
select RTC_LIB
select HAVE_DEBUG_STACKOVERFLOW
select HAVE_IRQ_EXIT_ON_IRQ_STACK if X86_64
+ select HAVE_CC_STACKPROTECTOR
+ select HAVE_ARCH_AUDITSYSCALL
config INSTRUCTION_DECODER
def_bool y
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2014-03-12 21:27 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-03-12 21:27 linux-next: manual merge of the audit tree with arch trees Mark Brown
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox