Merge remote-tracking branch 'torvalds/master' into perf-tools-next
authorArnaldo Carvalho de Melo <acme@redhat.com>
Thu, 10 Aug 2023 13:36:00 +0000 (10:36 -0300)
committerArnaldo Carvalho de Melo <acme@redhat.com>
Thu, 10 Aug 2023 13:36:00 +0000 (10:36 -0300)
To pick up some more fixes that went upstream via the perf-tools fixes
branch.

Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
1  2 
MAINTAINERS
tools/perf/util/machine.c

diff --cc MAINTAINERS
Simple merge
Simple merge