Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
authorDavid S. Miller <davem@davemloft.net>
Fri, 30 Jun 2017 16:43:08 +0000 (12:43 -0400)
committerDavid S. Miller <davem@davemloft.net>
Fri, 30 Jun 2017 16:43:08 +0000 (12:43 -0400)
commitb07911593719828cac023bdcf6bf4da1c9ba546f
treec4d2f66e6f2506e5b5439ffca0449e646f677b33
parent52a623bd6189b6ea8f06a0d7594c7604deaab24a
parent4d8a991d460d4fa4829beaffdcba45a217ca0fa7
Merge git://git./linux/kernel/git/davem/net

A set of overlapping changes in macvlan and the rocker
driver, nothing serious.

Signed-off-by: David S. Miller <davem@davemloft.net>
33 files changed:
MAINTAINERS
drivers/net/arcnet/arcnet.c
drivers/net/arcnet/capmode.c
drivers/net/arcnet/com20020-pci.c
drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
drivers/net/ethernet/broadcom/bnxt/bnxt.c
drivers/net/ethernet/broadcom/bnxt/bnxt.h
drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c
drivers/net/ethernet/rocker/rocker_ofdpa.c
drivers/net/ethernet/sfc/ef10.c
drivers/net/hyperv/netvsc_drv.c
drivers/net/macvlan.c
drivers/net/phy/micrel.c
drivers/net/usb/ax88179_178a.c
drivers/net/veth.c
drivers/net/virtio_net.c
drivers/scsi/qedi/qedi_fw.c
drivers/scsi/qedi/qedi_main.c
include/net/xfrm.h
kernel/bpf/verifier.c
net/core/dev.c
net/ipv4/tcp.c
net/ipv6/addrconf.c
net/ipv6/ip6_output.c
net/ipv6/route.c
net/ipv6/sit.c
net/ipv6/udp.c
net/key/af_key.c
net/sched/sch_api.c
net/xfrm/xfrm_device.c
net/xfrm/xfrm_policy.c
net/xfrm/xfrm_user.c
tools/testing/selftests/bpf/test_verifier.c