Merge branch 'linus' into timers/2038

Merge upstream to pick up changes on which pending patches depend on.

diff --cc arch/Kconfig
Simple merge

diff --cc arch/x86/events/core.c
Simple merge

diff --cc arch/x86/include/asm/ftrace.h
index db25aa1,cc8f8fc..c18ed65
--- 1/arch/x86/include/asm/ftrace.h
--- 2/arch/x86/include/asm/ftrace.h
+++ b/arch/x86/include/asm/ftrace.h
@@@ -46,10 -46,24 +46,24 @@@ int ftrace_int3_handler(struct pt_regs 
  #endif /* CONFIG_FUNCTION_TRACER */
  
  
- #if !defined(__ASSEMBLY__) && !defined(COMPILE_OFFSETS)
+ #ifndef __ASSEMBLY__
+ 
+ #define ARCH_HAS_SYSCALL_MATCH_SYM_NAME
+ static inline bool arch_syscall_match_sym_name(const char *sym, const char *name)
+ {
+       /*
+        * Compare the symbol name with the system call name. Skip the
+        * "__x64_sys", "__ia32_sys" or simple "sys" prefix.
+        */
+       return !strcmp(sym + 3, name + 3) ||
+               (!strncmp(sym, "__x64_", 6) && !strcmp(sym + 9, name + 3)) ||
+               (!strncmp(sym, "__ia32_", 7) && !strcmp(sym + 10, name + 3));
+ }
+ 
+ #ifndef COMPILE_OFFSETS
  
  #if defined(CONFIG_FTRACE_SYSCALLS) && defined(CONFIG_IA32_EMULATION)
 -#include <asm/compat.h>
 +#include <linux/compat.h>
  
  /*
   * Because ia32 syscalls do not map to x86_64 syscall numbers

diff --cc drivers/s390/net/qeth_core_main.c
Simple merge

diff --cc include/uapi/linux/time.h
Simple merge

diff --cc kernel/compat.c
Simple merge

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

diff --cc kernel/time/posix-stubs.c
Simple merge

diff --cc kernel/time/posix-timers.c
Simple merge