Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next
authorDavid S. Miller <davem@davemloft.net>
Sun, 21 Jan 2018 03:03:46 +0000 (22:03 -0500)
committerDavid S. Miller <davem@davemloft.net>
Sun, 21 Jan 2018 03:03:46 +0000 (22:03 -0500)
commitea9722e2650db8f0a0d9ef2e391c95285ef991cd
treec06d0fafd5d756733a329b726ad66986e471eecf
parent8565d26bcb2ff6df646e946d2913fcf706d46b66
parent1391040b6570584c177a238eeac01930beabbaa4
Merge git://git./linux/kernel/git/bpf/bpf-next

Alexei Starovoitov says:

====================
pull-request: bpf-next 2018-01-19

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

The main changes are:

1) bpf array map HW offload, from Jakub.

2) support for bpf_get_next_key() for LPM map, from Yonghong.

3) test_verifier now runs loaded programs, from Alexei.

4) xdp cpumap monitoring, from Jesper.

5) variety of tests, cleanups and small x64 JIT optimization, from Daniel.

6) user space can now retrieve HW JITed program, from Jiong.

Note there is a minor conflict between Russell's arm32 JIT fixes
and removal of bpf_jit_enable variable by Daniel which should
be resolved by keeping Russell's comment and removing that variable.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>
arch/arm/net/bpf_jit_32.c
arch/arm64/net/bpf_jit_comp.c
kernel/bpf/core.c
kernel/bpf/verifier.c
net/core/filter.c
tools/testing/selftests/bpf/test_verifier.c