diff options
| author |   Arnaldo Carvalho de Melo <acme@redhat.com> | 2019-12-11 09:58:16 -0300 |
|---|---|---|
| committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2019-12-11 09:58:16 -0300 |
| commit | 761bfc33dd7504de951aa7b9db27a3cc5df1fde6 (patch) | |
| tree | 93f4ac22fb206fe214998a599f4d2ea0214be70a /tools/perf | |
| parent | Merge tag 'perf-urgent-for-mingo-5.5-20191205' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/urgent (diff) | |
| parent | Merge tag 'for-5.5-rc1-kconfig-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux (diff) | |
| download | linux-dev-761bfc33dd7504de951aa7b9db27a3cc5df1fde6.tar.xz linux-dev-761bfc33dd7504de951aa7b9db27a3cc5df1fde6.zip | |
Merge remote-tracking branch 'torvalds/master' into perf/urgent
To pick up BPF fixes to allow a clean 'make -C tools/perf build-test':
7c3977d1e804 libbpf: Fix sym->st_value print on 32-bit arches
1fd450f99272 libbpf: Fix up generation of bpf_helper_defs.h
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools/perf')
| -rw-r--r-- | tools/perf/MANIFEST | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/tools/perf/MANIFEST b/tools/perf/MANIFEST index 70f1ff4e2eb4..4934edb5adfd 100644 --- a/tools/perf/MANIFEST +++ b/tools/perf/MANIFEST @@ -19,3 +19,4 @@ tools/lib/bitmap.c tools/lib/str_error_r.c tools/lib/vsprintf.c tools/lib/zalloc.c +scripts/bpf_helpers_doc.py |