Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf

Browse source

Alexei Starovoitov says:

====================
pull-request: bpf 2019-12-05

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

We've added 6 non-merge commits during the last 1 day(s) which contain
a total of 14 files changed, 116 insertions(+), 37 deletions(-).

The main changes are:

1) three selftests fixes, from Stanislav.

2) one samples fix, from Jesper.

3) one verifier fix, from Yonghong.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>

...

This commit is contained in:

David S. Miller 2019-12-06 00:04:15 -08:00

parent 0033b34a03 8f9081c925

commit ae72555b41

15 changed files with 136 additions and 57 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

5

kernel/bpf/verifier.c

View file

6

samples/bpf/xdp_rxq_info_user.c

View file

1

tools/lib/bpf/.gitignore vendored

View file

5

tools/lib/bpf/Makefile

View file

1

tools/testing/selftests/bpf/.gitignore vendored

View file

6

tools/testing/selftests/bpf/Makefile

View file

70

tools/testing/selftests/bpf/prog_tests/fexit_bpf2bpf.c

View file

26

tools/testing/selftests/bpf/progs/fexit_bpf2bpf_simple.c

View file

4

tools/testing/selftests/bpf/progs/test_pkt_md_access.c

View file

1

tools/testing/selftests/bpf/progs/test_tcpbpf_kern.c

View file

0

tools/lib/bpf/test_libbpf.c → tools/testing/selftests/bpf/test_cpp.cpp

View file

2

tools/testing/selftests/bpf/test_skb_cgroup_id_user.c

View file

1

tools/testing/selftests/bpf/test_tcpbpf.h

View file

25

tools/testing/selftests/bpf/test_tcpbpf_user.c

View file