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

[Stephen Rothwell]

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@xxxxxxxxxxxxxxxx

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

Attachment: pgp00000.pgp
Description: PGP signature