Merge remote-tracking branch 'tip/auto-latest'

Conflicts:
	arch/x86/Kconfig

diff --cc MAINTAINERS
Simple merge

diff --cc Makefile
Simple merge

diff --cc arch/Kconfig
Simple merge

diff --cc arch/mips/Kconfig
Simple merge

diff --cc arch/x86/Kconfig
index 3a41c4424a0a95b8b118ed428c3864a863c673a1,83db6b9af17453d2177a58037fdf54bfbb9b37f2..1c1c70a4bbe6e2edff88d941b7b0c3093475c6d7
--- 1/arch/x86/Kconfig
--- 2/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

diff --cc drivers/watchdog/hpwdt.c
Simple merge

diff --cc include/linux/sched.h
Simple merge

diff --cc init/Kconfig
Simple merge

diff --cc kernel/fork.c
Simple merge

diff --cc kernel/signal.c
Simple merge