From: Mark Brown <broonie@kernel•org>
To: Eric Paris <eparis@redhat•com>,
AKASHI Takahiro <takahiro.akashi@linaro•org>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org
Subject: linux-next: manual merge of the audit tree with arch trees
Date: Wed, 12 Mar 2014 21:27:39 +0000 [thread overview]
Message-ID: <20140312212739.b160142e6f75e4e9f23640ab@kernel.org> (raw)
[-- 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 --]
reply other threads:[~2014-03-12 21:27 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20140312212739.b160142e6f75e4e9f23640ab@kernel.org \
--to=broonie@kernel$(echo .)org \
--cc=eparis@redhat$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=takahiro.akashi@linaro$(echo .)org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox