Merge branch 'linus' into x86/urgent, to be able to merge a dependent fix

Signed-off-by: Ingo Molnar <mingo@kernel.org>

diff --combined arch/x86/include/asm/cpufeature.h
index a94f83d4272a2501c4859b15365a774ec8915918,477fc28050e447681e957a470d756205fef81eca..e6cf2ad350d15a8e6ca207a2618c77d820aacc22
--- 1/arch/x86/include/asm/cpufeature.h
--- 2/arch/x86/include/asm/cpufeature.h
+++ b/arch/x86/include/asm/cpufeature.h
@@@ -119,6 -119,7 +119,7 @@@
  #define X86_FEATURE_TM2               ( 4*32+ 8) /* Thermal Monitor 2 */
  #define X86_FEATURE_SSSE3     ( 4*32+ 9) /* Supplemental SSE-3 */
  #define X86_FEATURE_CID               ( 4*32+10) /* Context ID */
+ #define X86_FEATURE_SDBG      ( 4*32+11) /* Silicon Debug */
  #define X86_FEATURE_FMA               ( 4*32+12) /* Fused multiply-add */
  #define X86_FEATURE_CX16      ( 4*32+13) /* CMPXCHG16B */
  #define X86_FEATURE_XTPR      ( 4*32+14) /* Send Task Priority Messages */
@@@ -176,6 -177,7 +177,7 @@@
  #define X86_FEATURE_PERFCTR_NB  ( 6*32+24) /* NB performance counter extensions */
  #define X86_FEATURE_BPEXT     (6*32+26) /* data breakpoint extension */
  #define X86_FEATURE_PERFCTR_L2        ( 6*32+28) /* L2 performance counter extensions */
+ #define X86_FEATURE_MWAITX    ( 6*32+29) /* MWAIT extension (MONITORX/MWAITX) */
  
  /*
   * Auxiliary flags: Linux defined - For features scattered in various
@@@ -239,7 -241,6 +241,7 @@@
  #define X86_FEATURE_AVX512PF  ( 9*32+26) /* AVX-512 Prefetch */
  #define X86_FEATURE_AVX512ER  ( 9*32+27) /* AVX-512 Exponential and Reciprocal */
  #define X86_FEATURE_AVX512CD  ( 9*32+28) /* AVX-512 Conflict Detection */
 +#define X86_FEATURE_SHA_NI    ( 9*32+29) /* SHA1/SHA256 Instruction Extensions */
  
  /* Extended state features, CPUID level 0x0000000d:1 (eax), word 10 */
  #define X86_FEATURE_XSAVEOPT  (10*32+ 0) /* XSAVEOPT */