Merge branch 'x86-cpufeature-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

Pull x86 cpufeature updates from Ingo Molnar:
 "The main changes in this cycle were related to enable ring-3
  MONITOR/MWAIT instructions support on supported CPUs, by Grzegorz
  Andrejczuk and Piotr Luc"

* 'x86-cpufeature-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/cpufeature: Move RING3MWAIT feature to avoid conflicts
  x86/cpufeature: Enable RING3MWAIT for Knights Mill
  x86/cpufeature: Enable RING3MWAIT for Knights Landing
  x86/cpufeature: Add RING3MWAIT to CPU features
  x86/elf: Add HWCAP2 to expose ring 3 MONITOR/MWAIT
  x86/msr: Add MSR_MISC_FEATURE_ENABLES and RING3MWAIT bit
  x86/cpufeature: Add AVX512_VPOPCNTDQ feature

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

diff --cc arch/x86/kernel/cpu/common.c
Simple merge

diff --cc arch/x86/kernel/cpu/intel.c
Simple merge

diff --cc tools/arch/x86/include/asm/cpufeatures.h
index eafee3161d1c0fa04cd82b12dcf15003a89d04b4,3603556fa0d9dd2fac1e47bea1e288e014a7d4bc..293149a1c6a114999473a78199a186a5cf040d22
--- 1/tools/arch/x86/include/asm/cpufeatures.h
--- 2/tools/arch/x86/include/asm/cpufeatures.h
+++ b/tools/arch/x86/include/asm/cpufeatures.h
@@@ -285,10 -278,9 +285,11 @@@
  #define X86_FEATURE_AVIC      (15*32+13) /* Virtual Interrupt Controller */
  
  /* Intel-defined CPU features, CPUID level 0x00000007:0 (ecx), word 16 */
 +#define X86_FEATURE_AVX512VBMI  (16*32+ 1) /* AVX512 Vector Bit Manipulation instructions*/
  #define X86_FEATURE_PKU               (16*32+ 3) /* Protection Keys for Userspace */
  #define X86_FEATURE_OSPKE     (16*32+ 4) /* OS Protection Keys Enable */
+ #define X86_FEATURE_AVX512_VPOPCNTDQ (16*32+14) /* POPCNT for vectors of DW/QW */
 +#define X86_FEATURE_RDPID     (16*32+ 22) /* RDPID instruction */
  
  /* AMD-defined CPU features, CPUID level 0x80000007 (ebx), word 17 */
  #define X86_FEATURE_OVERFLOW_RECOV (17*32+0) /* MCA overflow recovery support */