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

diff --cc MAINTAINERS
Simple merge

diff --cc arch/x86/include/asm/mmu_context.h
Simple merge

diff --cc arch/x86/include/asm/thread_info.h
index b3b32f4c4d2dca6f30390e1a03495a203aa6032c,60aa7ec460f7106530bb095f6abc034797abe60e..6ad4d64a05861b0007e9d81bf72380475454599e
--- 1/arch/x86/include/asm/thread_info.h
--- 2/arch/x86/include/asm/thread_info.h
+++ b/arch/x86/include/asm/thread_info.h
@@@ -91,9 -91,7 +91,8 @@@ struct thread_info 
  #define TIF_NEED_FPU_LOAD     14      /* load FPU on return to userspace */
  #define TIF_NOCPUID           15      /* CPUID is not accessible in userland */
  #define TIF_NOTSC             16      /* TSC is not accessible in userland */
- #define TIF_IA32              17      /* IA32 compatibility process */
  #define TIF_SLD                       18      /* Restore split lock detection on context switch */
 +#define TIF_NOTIFY_SIGNAL     19      /* signal notifications exist */
  #define TIF_MEMDIE            20      /* is terminating due to OOM killer */
  #define TIF_POLLING_NRFLAG    21      /* idle is polling for TIF_NEED_RESCHED */
  #define TIF_IO_BITMAP         22      /* uses I/O bitmap */
@@@ -121,11 -119,10 +120,11 @@@
  #define _TIF_NEED_FPU_LOAD    (1 << TIF_NEED_FPU_LOAD)
  #define _TIF_NOCPUID          (1 << TIF_NOCPUID)
  #define _TIF_NOTSC            (1 << TIF_NOTSC)
- #define _TIF_IA32             (1 << TIF_IA32)
  #define _TIF_SLD              (1 << TIF_SLD)
 +#define _TIF_NOTIFY_SIGNAL    (1 << TIF_NOTIFY_SIGNAL)
  #define _TIF_POLLING_NRFLAG   (1 << TIF_POLLING_NRFLAG)
  #define _TIF_IO_BITMAP                (1 << TIF_IO_BITMAP)
+ #define _TIF_SPEC_FORCE_UPDATE        (1 << TIF_SPEC_FORCE_UPDATE)
  #define _TIF_FORCED_TF                (1 << TIF_FORCED_TF)
  #define _TIF_BLOCKSTEP                (1 << TIF_BLOCKSTEP)
  #define _TIF_LAZY_MMU_UPDATES (1 << TIF_LAZY_MMU_UPDATES)

diff --cc fs/binfmt_elf.c
Simple merge

diff --cc kernel/locking/lockdep.c
Simple merge