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

Conflicts:
	arch/Kconfig
	arch/s390/Kconfig

diff --cc Documentation/kernel-parameters.txt
Simple merge

diff --cc MAINTAINERS
Simple merge

diff --cc Makefile
Simple merge

diff --cc arch/Kconfig
index 3450115c64373da128ba7be90de61b8fd7d8f160,ea5feb6c1003bcf1c61a6ad86ea190d0351c8527..07db9299ea86e802374eb18176622d630f14fcb8
--- 1/arch/Kconfig
--- 2/arch/Kconfig
+++ b/arch/Kconfig
@@@ -281,23 -294,7 +294,26 @@@ config SECCOMP_FILTE
  
          See Documentation/prctl/seccomp_filter.txt for details.
  
 +config HAVE_MOD_ARCH_SPECIFIC
 +      bool
 +      help
 +        The arch uses struct mod_arch_specific to store data.  Many arches
 +        just need a simple module loader without arch specific data - those
 +        should not enable this.
 +
 +config MODULES_USE_ELF_RELA
 +      bool
 +      help
 +        Modules only use ELF RELA relocations.  Modules with ELF REL
 +        relocations will give an error.
 +
 +config MODULES_USE_ELF_REL
 +      bool
 +      help
 +        Modules only use ELF REL relocations.  Modules with ELF RELA
 +        relocations will give an error.
 +
+ config HAVE_VIRT_CPU_ACCOUNTING
+       bool
+ 
  source "kernel/gcov/Kconfig"

diff --cc arch/ia64/Kconfig
Simple merge

diff --cc arch/powerpc/kernel/process.c
Simple merge

diff --cc arch/powerpc/kernel/time.c
Simple merge

diff --cc arch/s390/Kconfig
index 2fd291547ffbebddbfcfc1a2934ace8424a2c632,f5ab543396da3889d7085e7c1dac035b64846650..a4843ddce69f466abbd45af68c3aab93ba1e44bb
--- 1/arch/s390/Kconfig
--- 2/arch/s390/Kconfig
+++ b/arch/s390/Kconfig
@@@ -96,7 -86,8 +93,9 @@@ config S39
        select HAVE_MEMBLOCK
        select HAVE_MEMBLOCK_NODE_MAP
        select HAVE_CMPXCHG_LOCAL
 +      select HAVE_CMPXCHG_DOUBLE
+       select HAVE_VIRT_CPU_ACCOUNTING
+       select VIRT_CPU_ACCOUNTING
        select ARCH_DISCARD_MEMBLOCK
        select BUILDTIME_EXTABLE_SORT
        select ARCH_INLINE_SPIN_TRYLOCK

diff --cc arch/s390/include/asm/switch_to.h
Simple merge

diff --cc arch/s390/kernel/vtime.c
Simple merge

diff --cc arch/x86/Kconfig
index 01726cbcc73bd23a7d318201247e2b1b8c909648,928336afc07a293e39f0f79f912936ec85a6555c..518be42372fd4c0a5719272b9742a30f8092bed2
--- 1/arch/x86/Kconfig
--- 2/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@@ -97,11 -102,10 +102,12 @@@ config X8
        select KTIME_SCALAR if X86_32
        select GENERIC_STRNCPY_FROM_USER
        select GENERIC_STRNLEN_USER
 +      select MODULES_USE_ELF_REL if X86_32
 +      select MODULES_USE_ELF_RELA if X86_64
  
  config INSTRUCTION_DECODER
-       def_bool (KPROBES || PERF_EVENTS || UPROBES)
+       def_bool y
+       depends on KPROBES || PERF_EVENTS || UPROBES
  
  config OUTPUT_FORMAT
        string

diff --cc init/Kconfig
Simple merge

diff --cc kernel/events/core.c
Simple merge

diff --cc kernel/sysctl.c
Simple merge

diff --cc kernel/time/timekeeping.c
Simple merge

diff --cc kernel/trace/trace.c
Simple merge

diff --cc kernel/trace/trace_functions.c
Simple merge

diff --cc tools/perf/perf.h
Simple merge

diff --cc tools/perf/util/parse-events-test.c
Simple merge