| commit | facbf0b9820f34f14b54f567862b4a96e910f468 | [log] [tgz] |
|---|---|---|
| author | Arnaldo Carvalho de Melo <acme@redhat.com> | Wed Jul 08 13:49:15 2020 -0300 |
| committer | Arnaldo Carvalho de Melo <acme@redhat.com> | Wed Jul 08 13:49:15 2020 -0300 |
| tree | ee65e875e4167dd903f2745cfbf6b2735fd1cd9e | |
| parent | 19bf119ccfa071b73a54465e8082ab2c8f8c30eb [diff] | |
| parent | dcde237b9b0eb1d19306e6f48c0a4e058907619f [diff] |
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 <acme@redhat.com>