projects / linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7c43b0c bcf8768)
Merge remote-tracking branch 'torvalds/master' into perf/core
authorArnaldo Carvalho de Melo <acme@redhat.com>
Mon, 3 Aug 2020 12:37:31 +0000 (09:37 -0300)
committerArnaldo Carvalho de Melo <acme@redhat.com>
Mon, 3 Aug 2020 12:37:31 +0000 (09:37 -0300)
Minor conflict in tools/perf/arch/arm/util/auxtrace.c as one fix there
was cherry-picked for the last perf/urgent pull req to Linus, so was
already there.

Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
1  2 
tools/lib/traceevent/event-parse.c patch | diff1 | diff2 | blob | history
tools/lib/traceevent/plugins/Makefile patch | diff1 | diff2 | blob | history

diff --cc tools/lib/traceevent/event-parse.c
Simple merge
diff --cc tools/lib/traceevent/plugins/Makefile
Simple merge
ep93xx device tree rework repo: git://git.maquefel.me/linux.git