projects / linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c7ba9d1 fdd0ae7)
Merge branch 'perf-tools' into perf-tools-next
authorNamhyung Kim <namhyung@kernel.org>
Mon, 12 Feb 2024 20:19:21 +0000 (12:19 -0800)
committerNamhyung Kim <namhyung@kernel.org>
Mon, 12 Feb 2024 20:19:21 +0000 (12:19 -0800)
To get some fixes in the perf test and JSON metrics into the development
branch.

Signed-off-by: Namhyung Kim <namhyung@kernel.org>
1  2 
tools/perf/Makefile.perf patch | diff1 | diff2 | blob | history
tools/perf/builtin-record.c patch | diff1 | diff2 | blob | history
tools/perf/builtin-top.c patch | diff1 | diff2 | blob | history

diff --cc tools/perf/Makefile.perf
Simple merge
diff --cc tools/perf/builtin-record.c
Simple merge
diff --cc tools/perf/builtin-top.c
Simple merge
ep93xx device tree rework repo: git://git.maquefel.me/linux.git