Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf
Alexei Starovoitov says:
====================
pull-request: bpf 2020-06-17
The following pull-request contains BPF updates for your *net* tree.
We've added 10 non-merge commits during the last 2 day(s) which contain
a total of 14 files changed, 158 insertions(+), 59 deletions(-).
The main changes are:
1) Important fix for bpf_probe_read_kernel_str() return value, from Andrii.
2) [gs]etsockopt fix for large optlen, from Stanislav.
3) devmap allocation fix, from Toke.
====================
Signed-off-by: 
David S. Miller <davem@davemloft.net>
Showing
- Documentation/bpf/prog_cgroup_sockopt.rst 14 additions, 0 deletionsDocumentation/bpf/prog_cgroup_sockopt.rst
- include/uapi/linux/bpf.h 1 addition, 1 deletioninclude/uapi/linux/bpf.h
- kernel/bpf/cgroup.c 33 additions, 20 deletionskernel/bpf/cgroup.c
- kernel/bpf/devmap.c 6 additions, 4 deletionskernel/bpf/devmap.c
- kernel/trace/bpf_trace.c 1 addition, 1 deletionkernel/trace/bpf_trace.c
- net/core/xdp.c 1 addition, 0 deletionsnet/core/xdp.c
- samples/bpf/xdp_monitor_user.c 2 additions, 6 deletionssamples/bpf/xdp_monitor_user.c
- samples/bpf/xdp_redirect_cpu_user.c 2 additions, 5 deletionssamples/bpf/xdp_redirect_cpu_user.c
- samples/bpf/xdp_rxq_info_user.c 3 additions, 10 deletionssamples/bpf/xdp_rxq_info_user.c
- tools/bpf/bpftool/Documentation/bpftool-map.rst 1 addition, 1 deletiontools/bpf/bpftool/Documentation/bpftool-map.rst
- tools/bpf/bpftool/map.c 2 additions, 1 deletiontools/bpf/bpftool/map.c
- tools/include/uapi/linux/bpf.h 1 addition, 1 deletiontools/include/uapi/linux/bpf.h
- tools/testing/selftests/bpf/prog_tests/sockopt_sk.c 39 additions, 7 deletionstools/testing/selftests/bpf/prog_tests/sockopt_sk.c
- tools/testing/selftests/bpf/progs/sockopt_sk.c 52 additions, 2 deletionstools/testing/selftests/bpf/progs/sockopt_sk.c
Please register or sign in to comment