Merge tag 'v5.2-rc6' into perf/core, to refresh branch

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

diff --cc arch/x86/include/asm/intel-family.h
index 087de5d3b93ae641df6d65dbbae06880b39d2e23,310118805f576e1585e9114e8d0a84c1008ddd4d..f60ddd655c7870b949b8717616db2ab5d7eb2e40
--- 1/arch/x86/include/asm/intel-family.h
--- 2/arch/x86/include/asm/intel-family.h
+++ b/arch/x86/include/asm/intel-family.h
@@@ -52,8 -52,10 +52,11 @@@
  
  #define INTEL_FAM6_CANNONLAKE_MOBILE  0x66
  
+ #define INTEL_FAM6_ICELAKE_X          0x6A
+ #define INTEL_FAM6_ICELAKE_XEON_D     0x6C
+ #define INTEL_FAM6_ICELAKE_DESKTOP    0x7D
  #define INTEL_FAM6_ICELAKE_MOBILE     0x7E
 +#define INTEL_FAM6_ICELAKE_NNPI               0x9D
  
  /* "Small Core" Processors (Atom) */
  

diff --cc kernel/trace/trace_uprobe.c
Simple merge