Merge branch 'x86/cpufeature' into x86/cache

Resolve the cpu/scattered conflict.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

diff --cc MAINTAINERS
Simple merge

diff --cc arch/x86/kernel/cpu/scattered.c
index 49fb680bb0e50f7154bc870b9e78d4c2c29285c1,d1316f9c8329846b0d3f7dede754fa0eef256bd3..d9794060fe225f72f34e78cdc74959aa1bf38934
--- 1/arch/x86/kernel/cpu/scattered.c
--- 2/arch/x86/kernel/cpu/scattered.c
+++ b/arch/x86/kernel/cpu/scattered.c
@@@ -17,11 -17,17 +17,20 @@@ struct cpuid_bit 
        u32 sub_leaf;
  };
  
- enum cpuid_regs {
-       CR_EAX = 0,
-       CR_ECX,
-       CR_EDX,
-       CR_EBX
+ /* Please keep the leaf sorted by cpuid_bit.level for faster search. */
+ static const struct cpuid_bit cpuid_bits[] = {
+       { X86_FEATURE_APERFMPERF,       CPUID_ECX,  0, 0x00000006, 0 },
 -      { X86_FEATURE_EPB,              CPUID_ECX,  3, 0x00000006, 0 },
 -      { X86_FEATURE_INTEL_PT,         CPUID_EBX, 25, 0x00000007, 0 },
++      { X86_FEATURE_EPB,              CPUID_ECX,  3, 0x00000006, 0 },
++      { X86_FEATURE_INTEL_PT,         CPUID_EBX, 25, 0x00000007, 0 },
+       { X86_FEATURE_AVX512_4VNNIW,    CPUID_EDX,  2, 0x00000007, 0 },
+       { X86_FEATURE_AVX512_4FMAPS,    CPUID_EDX,  3, 0x00000007, 0 },
 -      { X86_FEATURE_HW_PSTATE,        CPUID_EDX,  7, 0x80000007, 0 },
 -      { X86_FEATURE_CPB,              CPUID_EDX,  9, 0x80000007, 0 },
++      { X86_FEATURE_CAT_L3,           CPUID_EBX,  1, 0x00000010, 0 },
++      { X86_FEATURE_CAT_L2,           CPUID_EBX,  2, 0x00000010, 0 },
++      { X86_FEATURE_CDP_L3,           CPUID_ECX,  2, 0x00000010, 1 },
++      { X86_FEATURE_HW_PSTATE,        CPUID_EDX,  7, 0x80000007, 0 },
++      { X86_FEATURE_CPB,              CPUID_EDX,  9, 0x80000007, 0 },
+       { X86_FEATURE_PROC_FEEDBACK,    CPUID_EDX, 11, 0x80000007, 0 },
+       { 0, 0, 0, 0, 0 }
  };
  
  void init_scattered_cpuid_features(struct cpuinfo_x86 *c)