linux-kernel - linux-next: manual merge of the audit tree with arch trees

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Date:	Wed, 12 Mar 2014 21:27:39 +0000
From:	Mark Brown <broonie@...nel.org>
To:	Eric Paris <eparis@...hat.com>,
	AKASHI Takahiro <takahiro.akashi@...aro.org>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org
Subject: linux-next: manual merge of the audit tree with arch trees

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

Content of type "application/pgp-signature" skipped