projects / linux-block.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: d36e5b3 59b723c)
Merge 'origin/master' into perf-tools-next
authorNamhyung Kim <namhyung@kernel.org>
Mon, 4 Nov 2024 07:16:30 +0000 (23:16 -0800)
committerNamhyung Kim <namhyung@kernel.org>
Mon, 4 Nov 2024 07:18:20 +0000 (23:18 -0800)
commitaa5c90601b531323f82ceb02b41a66974153b76f
tree80ca2bed534b3b356bffa60eab11980c3f9a3400tree
parentd36e5b36a2928b30e09ff59ce5ce2d5df935176ecommit | diff
parent59b723cd2adbac2a34fc8e12c74ae26ae45bf230commit | diff
Merge 'origin/master' into perf-tools-next

To get the fixes in the perf-tools branch.  Resolved a conflict due to
RISC-V's syscall table change.

Signed-off-by: Namhyung Kim <namhyung@kernel.org>
tools/perf/Makefile.config diff1 | diff2 | blob | history
tools/perf/builtin-trace.c diff1 | diff2 | blob | history
tools/perf/util/syscalltbl.c diff1 | diff2 | blob | history
Linux 6.x block layer and io_uring tree(s)