Merge remote-tracking branch 'torvalds/master' into perf-tools-next
authorArnaldo Carvalho de Melo <acme@redhat.com>
Fri, 4 Aug 2023 13:06:38 +0000 (10:06 -0300)
committerArnaldo Carvalho de Melo <acme@redhat.com>
Fri, 4 Aug 2023 13:06:38 +0000 (10:06 -0300)
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>
1  2 
MAINTAINERS
tools/perf/util/parse-events.c
tools/perf/util/pmu.c

diff --cc MAINTAINERS
Simple merge
Simple merge
Simple merge