linux-kernel - linux-next: manual merge of the tip tree with the security tree

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]

Message-Id: <20120427132934.1b8417677987f817797485be@canb.auug.org.au>
Date:	Fri, 27 Apr 2012 13:29:34 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Thomas Gleixner <tglx@...utronix.de>, Ingo Molnar <mingo@...e.hu>,
	"H. Peter Anvin" <hpa@...or.com>,
	Peter Zijlstra <peterz@...radead.org>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	David Daney <ddaney@...iumnetworks.com>,
	Will Drewry <wad@...omium.org>,
	James Morris <jmorris@...ei.org>
Subject: linux-next: manual merge of the tip tree with the security tree

Hi all,

Today's linux-next merge of the tip tree got a conflict in
arch/x86/Kconfig between commit c6cfbeb40296 ("x86: Enable
HAVE_ARCH_SECCOMP_FILTER") from the security tree and commit 8b5ad4729917
("Revert "x86, extable: Disable presorted exception table for now"") from
the tip tree.

Just context changes.  I fixed it up (see below) and can carry the fix as
necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

diff --cc arch/x86/Kconfig
index 3a41c44,83db6b9..0000000
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@@ -82,10 -83,10 +83,11 @@@ config X8
  	select ARCH_HAVE_NMI_SAFE_CMPXCHG
  	select GENERIC_IOMAP
  	select DCACHE_WORD_ACCESS if !DEBUG_PAGEALLOC
 +	select HAVE_ARCH_SECCOMP_FILTER
+ 	select BUILDTIME_EXTABLE_SORT
  
  config INSTRUCTION_DECODER
- 	def_bool (KPROBES || PERF_EVENTS)
+ 	def_bool (KPROBES || PERF_EVENTS || UPROBES)
  
  config OUTPUT_FORMAT
  	string

Content of type "application/pgp-signature" skipped