]> www.infradead.org Git - users/hch/dma-mapping.git/commitdiff
projects / users / hch / dma-mapping.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8c49c6e 374a7f4)
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 patch | diff1 | diff2 | blob | history
tools/perf/util/machine.c patch | diff1 | diff2 | blob | history

diff --cc MAINTAINERS
Simple merge
diff --cc tools/perf/util/machine.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.