diff options
| author | David S. Miller <davem@davemloft.net> | 2019-04-23 07:35:55 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-04-23 07:35:55 +0300 |
| commit | 2843ba2ec75948e274d2c4f0a9390980e68a6461 (patch) | |
| tree | b2fde70246956609ac43ad62026a4fdb48e33fbc /tools/bpf/bpftool/Documentation/bpftool-map.rst | |
| parent | be659b8d3c79afc54e087ebf8d849685d7b0d395 (diff) | |
| parent | f79b464fd6b56b6256de43bc4c7d5968c0e52968 (diff) | |
| download | linux-2843ba2ec75948e274d2c4f0a9390980e68a6461.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next
Alexei Starovoitov says:
====================
pull-request: bpf-next 2019-04-22
The following pull-request contains BPF updates for your *net-next* tree.
The main changes are:
1) allow stack/queue helpers from more bpf program types, from Alban.
2) allow parallel verification of root bpf programs, from Alexei.
3) introduce bpf sysctl hook for trusted root cases, from Andrey.
4) recognize var/datasec in btf deduplication, from Andrii.
5) cpumap performance optimizations, from Jesper.
6) verifier prep for alu32 optimization, from Jiong.
7) libbpf xsk cleanup, from Magnus.
8) other various fixes and cleanups.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'tools/bpf/bpftool/Documentation/bpftool-map.rst')
| -rw-r--r-- | tools/bpf/bpftool/Documentation/bpftool-map.rst | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/bpf/bpftool/Documentation/bpftool-map.rst b/tools/bpf/bpftool/Documentation/bpftool-map.rst index 5c984ffc9f01..55ecf80ca03e 100644 --- a/tools/bpf/bpftool/Documentation/bpftool-map.rst +++ b/tools/bpf/bpftool/Documentation/bpftool-map.rst @@ -135,7 +135,7 @@ OPTIONS -h, --help Print short generic help message (similar to **bpftool help**). - -v, --version + -V, --version Print version number (similar to **bpftool version**). -j, --json |