diff options
author | David S. Miller <davem@davemloft.net> | 2018-09-24 10:08:45 -0700 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2018-09-24 10:08:45 -0700 |
commit | d2f85c9e1cf8ecdccae3e44fb2c4a36b1bbc4cb7 (patch) | |
tree | 1616476f981ae7870a552f38ee429307379954a8 /net/mpls | |
parent | d26ed6b0e5e23190d43ab34bc69cbecdc464a2cf (diff) | |
parent | fad0c40fab14523ca381a30fef88b7c3266bef1c (diff) | |
download | linux-d2f85c9e1cf8ecdccae3e44fb2c4a36b1bbc4cb7.tar.bz2 |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf
Daniel Borkmann says:
====================
pull-request: bpf 2018-09-24
The following pull-request contains BPF updates for your *net* tree.
The main changes are:
1) Several fixes for BPF sockmap to only allow sockets being attached in
ESTABLISHED state, from John.
2) Fix up the license to LGPL/BSD for the libc compat header which contains
fallback helpers that libbpf and bpftool is using, from Jakub.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/mpls')
0 files changed, 0 insertions, 0 deletions