Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
authorDavid S. Miller <davem@davemloft.net>
Sat, 5 Oct 2019 20:37:23 +0000 (13:37 -0700)
committerDavid S. Miller <davem@davemloft.net>
Sat, 5 Oct 2019 20:37:23 +0000 (13:37 -0700)
14 files changed:
1  2 
MAINTAINERS
drivers/net/dsa/sja1105/sja1105_main.c
drivers/net/dsa/sja1105/sja1105_spi.c
drivers/net/ethernet/stmicro/stmmac/dwxgmac2_dma.c
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
drivers/net/phy/at803x.c
drivers/net/usb/r8152.c
net/core/devlink.c
net/core/sock.c
net/ipv4/ipmr.c
net/ipv4/tcp_ipv4.c
net/ipv6/addrconf.c
net/rds/ib.c
net/vmw_vsock/virtio_transport_common.c

diff --cc MAINTAINERS
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc net/core/sock.c
Simple merge
diff --cc net/ipv4/ipmr.c
Simple merge
Simple merge
Simple merge
diff --cc net/rds/ib.c
Simple merge