diff options
author | 2021-10-08 11:13:17 -0300 | |
---|---|---|
committer | 2021-10-08 11:13:17 -0300 | |
commit | 47e7dd34a26def31af352df3a8281e7ff1bc345a (patch) | |
tree | f8cbd86ce126d65f79bca2ceefbaea6130923e1b /tools/perf/builtin-daemon.c | |
parent | perf srcline: Use long-running addr2line per DSO (diff) | |
parent | Merge tag 'nfsd-5.15-3' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux (diff) | |
download | linux-dev-47e7dd34a26def31af352df3a8281e7ff1bc345a.tar.xz linux-dev-47e7dd34a26def31af352df3a8281e7ff1bc345a.zip |
Merge remote-tracking branch 'torvalds/master' into perf/core
To pick up the fixes in perf/urgent that were just merged into upstream.
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools/perf/builtin-daemon.c')
0 files changed, 0 insertions, 0 deletions