Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next
authorDavid S. Miller <davem@davemloft.net>
Thu, 20 Jun 2019 04:06:27 +0000 (00:06 -0400)
committerDavid S. Miller <davem@davemloft.net>
Thu, 20 Jun 2019 04:06:27 +0000 (00:06 -0400)
commitdca73a65a68329ee386d3ff473152bac66eaab39
tree97c41afb932bdd6cbe67e7ffc38bfe5952c97798
parent497ad9f5b2dc86b733761b9afa44ecfa2f17be65
parent94079b64255fe40b9b53fd2e4081f68b9b14f54a
Merge git://git./linux/kernel/git/bpf/bpf-next

Alexei Starovoitov says:

====================
pull-request: bpf-next 2019-06-19

The following pull-request contains BPF updates for your *net-next* tree.

The main changes are:

1) new SO_REUSEPORT_DETACH_BPF setsocktopt, from Martin.

2) BTF based map definition, from Andrii.

3) support bpf_map_lookup_elem for xskmap, from Jonathan.

4) bounded loops and scalar precision logic in the verifier, from Alexei.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>
17 files changed:
include/linux/bpf.h
include/linux/bpf_verifier.h
include/uapi/linux/bpf.h
kernel/bpf/devmap.c
kernel/bpf/verifier.c
net/core/filter.c
net/core/sock.c
samples/bpf/xdp1_user.c
samples/bpf/xdp_redirect_map_user.c
samples/bpf/xdp_redirect_user.c
samples/bpf/xdp_router_ipv4_user.c
samples/bpf/xdp_tx_iptunnel_user.c
tools/include/uapi/linux/bpf.h
tools/lib/bpf/libbpf.c
tools/lib/bpf/libbpf_internal.h
tools/testing/selftests/bpf/Makefile
tools/testing/selftests/bpf/test_verifier.c