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)
commitbf1842996aaa726bf3d108b41f366b88680acbe6
treee00bac5f0191e8e6dc8be26f2efda8c073051e9e
parentf6b8436bede3e80226e8b2100279c4450c73806a
parentc1a515d3c0270628df8ae5f5118ba859b85464a2
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>
MAINTAINERS
tools/perf/util/parse-events.c
tools/perf/util/pmu.c