diff options
| author | Alexei Starovoitov <ast@kernel.org> | 2025-11-14 17:43:41 -0800 |
|---|---|---|
| committer | Alexei Starovoitov <ast@kernel.org> | 2025-11-14 17:43:41 -0800 |
| commit | e47b68bda4de6a848a8b6c79316542326a8fb3ca (patch) | |
| tree | bb1300a3177f5c92e2698fab42178f160f41316e /tools/bpf | |
| parent | ef2c0b2e56ad710a2b5a85b678a6c685756e03a4 (diff) | |
| parent | 7a0892d2836e12cc61b6823f888629a3eb64e268 (diff) | |
| download | linux-e47b68bda4de6a848a8b6c79316542326a8fb3ca.tar.gz linux-e47b68bda4de6a848a8b6c79316542326a8fb3ca.tar.bz2 linux-e47b68bda4de6a848a8b6c79316542326a8fb3ca.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf after 6.18-rc5+
Cross-merge BPF and other fixes after downstream PR.
Minor conflict in kernel/bpf/helpers.c
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
Diffstat (limited to 'tools/bpf')
| -rw-r--r-- | tools/bpf/bpftool/Documentation/bpftool-prog.rst | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/bpf/bpftool/Documentation/bpftool-prog.rst b/tools/bpf/bpftool/Documentation/bpftool-prog.rst index 009633294b09..35aeeaf5f711 100644 --- a/tools/bpf/bpftool/Documentation/bpftool-prog.rst +++ b/tools/bpf/bpftool/Documentation/bpftool-prog.rst @@ -182,7 +182,7 @@ bpftool prog tracelog bpftool prog tracelog { stdout | stderr } *PROG* Dump the BPF stream of the program. BPF programs can write to these streams - at runtime with the **bpf_stream_vprintk**\ () kfunc. The kernel may write + at runtime with the **bpf_stream_vprintk_impl**\ () kfunc. The kernel may write error messages to the standard error stream. This facility should be used only for debugging purposes. |