diff options
| author | Arnaldo Carvalho de Melo <[email protected]> | 2020-07-08 16:49:15 +0000 |
|---|---|---|
| committer | Arnaldo Carvalho de Melo <[email protected]> | 2020-07-08 16:49:15 +0000 |
| commit | facbf0b9820f34f14b54f567862b4a96e910f468 (patch) | |
| tree | ee65e875e4167dd903f2745cfbf6b2735fd1cd9e /tools/perf/util/annotate.c | |
| parent | perf symbols: Add s390 idle functions 'psw_idle' and 'psw_idle_exit' to list ... (diff) | |
| parent | Merge tag 'perf-tools-fixes-2020-07-07' of git://git.kernel.org/pub/scm/linux... (diff) | |
| download | kernel-facbf0b9820f34f14b54f567862b4a96e910f468.tar.gz kernel-facbf0b9820f34f14b54f567862b4a96e910f468.zip | |
Merge remote-tracking branch 'torvalds/master' into perf/core
To pick up fixes and move perf/core forward, minor conflict as
perf_evlist__add_dummy() lost its 'perf_' prefix as it operates on a
'struct evlist', not on a 'struct perf_evlist', i.e. its tools/perf/
specific, it is not in libperf.
Signed-off-by: Arnaldo Carvalho de Melo <[email protected]>
Diffstat (limited to 'tools/perf/util/annotate.c')
0 files changed, 0 insertions, 0 deletions