Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
authorDavid S. Miller <davem@davemloft.net>
Tue, 22 Aug 2017 00:06:42 +0000 (17:06 -0700)
committerDavid S. Miller <davem@davemloft.net>
Tue, 22 Aug 2017 00:06:42 +0000 (17:06 -0700)
commite2a7c34fb2856fd5306e307e170e3dde358d0dce
treeafeb300b04186b1a1f649b2cd8a401a75878297c
parent7d3f0cd43feea1636dd7746f22fe8249b34d1b79
parent6470812e22261d2342ef1597be62e63a0423d691
Merge git://git./linux/kernel/git/davem/net
20 files changed:
MAINTAINERS
drivers/net/ethernet/mellanox/mlx4/main.c
drivers/net/ethernet/netronome/nfp/nfp_net_common.c
drivers/net/tun.c
include/net/ip.h
include/net/sch_generic.h
include/net/sock.h
kernel/events/core.c
net/core/datagram.c
net/ipv4/igmp.c
net/ipv4/route.c
net/ipv4/tcp_input.c
net/ipv4/udp.c
net/ipv6/ip6_fib.c
net/ipv6/udp.c
net/openvswitch/datapath.c
net/sched/cls_api.c
net/sctp/ipv6.c
net/unix/af_unix.c
tools/lib/bpf/libbpf.c