projects / platform / kernel / linux-starfive.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 32f7aa2 fe91c47)
Merge remote-tracking branch 'torvalds/master' into perf/core
authorArnaldo Carvalho de Melo <acme@redhat.com>
Sat, 6 Nov 2021 18:49:33 +0000 (15:49 -0300)
committerArnaldo Carvalho de Melo <acme@redhat.com>
Sat, 6 Nov 2021 18:49:33 +0000 (15:49 -0300)
To pick up some tools/perf/ patches that went via tip/perf/core, such
as:

  tools/perf: Add mem_hops field in perf_mem_data_src structure

Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
1  2 
tools/include/uapi/linux/perf_event.h patch | diff1 | diff2 | blob | history
tools/perf/util/bpf-event.c patch | diff1 | diff2 | blob | history

diff --cc tools/include/uapi/linux/perf_event.h
Simple merge
diff --cc tools/perf/util/bpf-event.c
Simple merge
Domain: System / Kernel;