diff options
| author | David S. Miller <davem@davemloft.net> | 2020-05-02 02:02:27 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2020-05-02 02:02:27 +0200 |
| commit | 115506fea499f1cd9a80290b31eca4352e0559e9 (patch) | |
| tree | 25e4ff3b5a49115d964fab690cf72fa18a5f96bf /tools/bpf/bpftool/btf.c | |
| parent | Merge branch 'net-smc-extent-buffer-mapping-and-port-handling' (diff) | |
| parent | selftests/bpf: Use reno instead of dctcp (diff) | |
| download | linux-115506fea499f1cd9a80290b31eca4352e0559e9.tar.xz linux-115506fea499f1cd9a80290b31eca4352e0559e9.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next
Alexei Starovoitov says:
====================
pull-request: bpf-next 2020-05-01 (v2)
The following pull-request contains BPF updates for your *net-next* tree.
We've added 61 non-merge commits during the last 6 day(s) which contain
a total of 153 files changed, 6739 insertions(+), 3367 deletions(-).
The main changes are:
1) pulled work.sysctl from vfs tree with sysctl bpf changes.
2) bpf_link observability, from Andrii.
3) BTF-defined map in map, from Andrii.
4) asan fixes for selftests, from Andrii.
5) Allow bpf_map_lookup_elem for SOCKMAP and SOCKHASH, from Jakub.
6) production cloudflare classifier as a selftes, from Lorenz.
7) bpf_ktime_get_*_ns() helper improvements, from Maciej.
8) unprivileged bpftool feature probe, from Quentin.
9) BPF_ENABLE_STATS command, from Song.
10) enable bpf_[gs]etsockopt() helpers for sock_ops progs, from Stanislav.
11) enable a bunch of common helpers for cg-device, sysctl, sockopt progs,
from Stanislav.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'tools/bpf/bpftool/btf.c')
| -rw-r--r-- | tools/bpf/bpftool/btf.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/tools/bpf/bpftool/btf.c b/tools/bpf/bpftool/btf.c index bcaf55b59498..41a1346934a1 100644 --- a/tools/bpf/bpftool/btf.c +++ b/tools/bpf/bpftool/btf.c @@ -15,7 +15,6 @@ #include <linux/hashtable.h> #include <sys/types.h> #include <sys/stat.h> -#include <unistd.h> #include "json_writer.h" #include "main.h" |