Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/net/dsa/sja1105/sja1105_main.c
Simple merge

diff --cc drivers/net/dsa/sja1105/sja1105_spi.c
Simple merge

diff --cc drivers/net/ethernet/stmicro/stmmac/dwxgmac2_dma.c
Simple merge

diff --cc drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
Simple merge

diff --cc drivers/net/phy/at803x.c
Simple merge

diff --cc drivers/net/usb/r8152.c
Simple merge

diff --cc net/core/devlink.c
Simple merge

diff --cc net/core/sock.c
Simple merge

diff --cc net/ipv4/ipmr.c
Simple merge

diff --cc net/ipv4/tcp_ipv4.c
Simple merge

diff --cc net/ipv6/addrconf.c
Simple merge

diff --cc net/rds/ib.c
Simple merge

diff --cc net/vmw_vsock/virtio_transport_common.c
Simple merge