Merge remote-tracking branch 'torvalds/master' into perf/core

To resolve a trivial merge conflict with c302378bc157f6a7 ("libbpf:
Hashmap interface update to allow both long and void* keys/values"),
where a function present upstream was removed in the perf tools
development tree.

Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

diff --cc MAINTAINERS
Simple merge

diff --cc tools/lib/bpf/Makefile
Simple merge

diff --cc tools/perf/tests/expr.c
Simple merge

diff --cc tools/perf/tests/pmu-events.c
Simple merge

diff --cc tools/perf/util/bpf-loader.c
Simple merge

diff --cc tools/perf/util/evsel.c
Simple merge

diff --cc tools/perf/util/expr.c
Simple merge

diff --cc tools/perf/util/metricgroup.c
Simple merge

diff --cc tools/perf/util/stat-shadow.c
Simple merge

diff --cc tools/perf/util/stat.c
index 673f017a211f66c6cdb70ff7d9ed800db6bdb805,c0656f85bfa58ed466446bef7fad618f7bfb5c8d..534d36d26fc38a5ae9c94ce917e581eb6fd6e856
--- 1/tools/perf/util/stat.c
--- 2/tools/perf/util/stat.c
+++ b/tools/perf/util/stat.c
@@@ -314,7 -258,27 +314,7 @@@ void evlist__copy_prev_raw_counts(struc
                evsel__copy_prev_raw_counts(evsel);
  }
  
- static size_t pkg_id_hash(const void *__key, void *ctx __maybe_unused)
 -void evlist__save_aggr_prev_raw_counts(struct evlist *evlist)
 -{
 -      struct evsel *evsel;
 -
 -      /*
 -       * To collect the overall statistics for interval mode,
 -       * we copy the counts from evsel->prev_raw_counts to
 -       * evsel->counts. The perf_stat_process_counter creates
 -       * aggr values from per cpu values, but the per cpu values
 -       * are 0 for AGGR_GLOBAL. So we use a trick that saves the
 -       * previous aggr value to the first member of perf_counts,
 -       * then aggr calculation in process_counter_values can work
 -       * correctly.
 -       */
 -      evlist__for_each_entry(evlist, evsel) {
 -              *perf_counts(evsel->prev_raw_counts, 0, 0) =
 -                      evsel->prev_raw_counts->aggr;
 -      }
 -}
 -
+ static size_t pkg_id_hash(long __key, void *ctx __maybe_unused)
  {
        uint64_t *key = (uint64_t *) __key;