diff options
| author |   David S. Miller <davem@davemloft.net> | 2020-02-29 15:53:35 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2020-02-29 15:53:35 -0800 |
| commit | 9f0ca0c1a50a7de5c71970aa452941199ed210d9 (patch) | |
| tree | b7e19ab2e5bbc951141fb90489923b50b8f263f3 /include/net/pkt_sched.h | |
| parent | Merge branch 'net-cleanup-datagram-receive-helpers' (diff) | |
| parent | Merge branch 'bpf_sk_storage_via_inet_diag' (diff) | |
| download | linux-dev-9f0ca0c1a50a7de5c71970aa452941199ed210d9.tar.xz linux-dev-9f0ca0c1a50a7de5c71970aa452941199ed210d9.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next
Alexei Starovoitov says:
====================
pull-request: bpf-next 2020-02-28
The following pull-request contains BPF updates for your *net-next* tree.
We've added 41 non-merge commits during the last 7 day(s) which contain
a total of 49 files changed, 1383 insertions(+), 499 deletions(-).
The main changes are:
1) BPF and Real-Time nicely co-exist.
2) bpftool feature improvements.
3) retrieve bpf_sk_storage via INET_DIAG.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net/pkt_sched.h')
0 files changed, 0 insertions, 0 deletions