Merge branch 'perf/urgent' into perf/core

To pick fixes that missed v5.9.

Signed-off-by: Arnaldo Carvalho de Melo <[email protected]>

diff --cc tools/perf/util/metricgroup.c
index 55ea514ac0ce9026acf5b1c684197640dd1aaff4,d948a7f910cfa1eaccdd6b9551c6c47c008440c2..060454a172935cb52a4f4c98129271cce27b5751
--- 1/tools/perf/util/metricgroup.c
--- 2/tools/perf/util/metricgroup.c
+++ b/tools/perf/util/metricgroup.c
@@@ -150,8 -150,20 +150,20 @@@ static void expr_ids__exit(struct expr_
                free(ids->id[i].id);
  }
  
+ static bool contains_event(struct evsel **metric_events, int num_events,
+                       const char *event_name)
+ {
+       int i;
+ 
+       for (i = 0; i < num_events; i++) {
+               if (!strcmp(metric_events[i]->name, event_name))
+                       return true;
+       }
+       return false;
+ }
+ 
  /**
 - * Find a group of events in perf_evlist that correpond to those from a parsed
 + * Find a group of events in perf_evlist that correspond to those from a parsed
   * metric expression. Note, as find_evsel_group is called in the same order as
   * perf_evlist was constructed, metric_no_merge doesn't need to test for
   * underfilling a group.

diff --cc tools/perf/util/parse-events.c
Simple merge