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

Signed-off-by: Ingo Molnar <[email protected]>

diff --combined 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 --combined kernel/trace/trace_uprobe.c
index 0d60d6856de53993fd67d393b0a82362881108c9,b55906c77ce0602ad6d7f0c20225e99f288ddbb9..7860e3f59fad6e257c9a8381f2a2d9b5ce9d70dd
--- 1/kernel/trace/trace_uprobe.c
--- 2/kernel/trace/trace_uprobe.c
+++ b/kernel/trace/trace_uprobe.c
@@@ -426,8 -426,6 +426,6 @@@ end
  /*
   * Argument syntax:
   *  - Add uprobe: p|r[:[GRP/]EVENT] PATH:OFFSET [FETCHARGS]
-  *
-  *  - Remove uprobe: -:[GRP/]EVENT
   */
  static int trace_uprobe_create(int argc, const char **argv)
  {
@@@ -443,10 -441,17 +441,17 @@@
        ret = 0;
        ref_ctr_offset = 0;
  
-       /* argc must be >= 1 */
-       if (argv[0][0] == 'r')
+       switch (argv[0][0]) {
+       case 'r':
                is_return = true;
-       else if (argv[0][0] != 'p' || argc < 2)
+               break;
+       case 'p':
+               break;
+       default:
+               return -ECANCELED;
+       }
+ 
+       if (argc < 2)
                return -ECANCELED;
  
        if (argv[0][1] == ':')
@@@ -1331,7 -1336,7 +1336,7 @@@ static inline void init_trace_event_cal
        call->event.funcs = &uprobe_funcs;
        call->class->define_fields = uprobe_event_define_fields;
  
 -      call->flags = TRACE_EVENT_FL_UPROBE;
 +      call->flags = TRACE_EVENT_FL_UPROBE | TRACE_EVENT_FL_CAP_ANY;
        call->class->reg = trace_uprobe_register;
        call->data = tu;
  }