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)
commit55b290501928bb2648978257e7a00fc3a64b15fa
tree865d9d1b30845abe3ed5605832af6961f4dc3ac7
parent8c49c6e1a7b790c4cb9f464c5485117451d91c60
parent374a7f47bf401441edff0a64465e61326bf70a82
Merge remote-tracking branch 'torvalds/master' into perf-tools-next

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>
MAINTAINERS
tools/perf/util/machine.c