Merge remote-tracking branch 'torvalds/master' into perf-tools-next

To pick up the fixes that were just merged from perf-tools/perf-tools
for v6.5.

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

diff --cc MAINTAINERS
Simple merge

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

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