Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
authorDavid S. Miller <davem@davemloft.net>
Fri, 22 Dec 2017 16:16:31 +0000 (11:16 -0500)
committerDavid S. Miller <davem@davemloft.net>
Fri, 22 Dec 2017 16:16:31 +0000 (11:16 -0500)
commitfba961ab29e5ffb055592442808bb0f7962e05da
tree5180c384b79399c469e0ed88211114e6ab249484
parent0a80f0c26bf5a131892b91db5318eb67608006d2
parentead68f216110170ec729e2c4dec0aad6d38259d7
Merge git://git./linux/kernel/git/davem/net

Lots of overlapping changes.  Also on the net-next side
the XDP state management is handled more in the generic
layers so undo the 'net' nfp fix which isn't applicable
in net-next.

Include a necessary change by Jakub Kicinski, with log message:

====================
cls_bpf no longer takes care of offload tracking.  Make sure
netdevsim performs necessary checks.  This fixes a warning
caused by TC trying to remove a filter it has not added.

Signed-off-by: Jakub Kicinski <jakub.kicinski@netronome.com>
Reviewed-by: Quentin Monnet <quentin.monnet@netronome.com>
====================

Signed-off-by: David S. Miller <davem@davemloft.net>
26 files changed:
arch/powerpc/net/bpf_jit_comp64.c
arch/s390/net/bpf_jit_comp.c
arch/sparc/net/bpf_jit_comp_64.c
drivers/net/ethernet/mellanox/mlx5/core/en_main.c
drivers/net/ethernet/netronome/nfp/bpf/main.c
drivers/net/ethernet/netronome/nfp/bpf/main.h
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
drivers/net/netdevsim/bpf.c
drivers/net/phy/marvell.c
drivers/net/vxlan.c
drivers/s390/net/qeth_core_main.c
include/linux/bpf_verifier.h
include/net/pkt_cls.h
kernel/bpf/verifier.c
net/core/dev.c
net/ipv4/ip_gre.c
net/ipv6/ip6_gre.c
net/ipv6/ip6_output.c
net/ipv6/ip6_tunnel.c
net/ipv6/route.c
net/openvswitch/flow.c
net/sctp/ulpqueue.c
tools/testing/selftests/bpf/Makefile
tools/testing/selftests/bpf/test_offload.py
tools/testing/selftests/bpf/test_progs.c
tools/testing/selftests/bpf/test_verifier.c