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

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlx5/core/en_main.c
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlx5/core/main.c
Simple merge

diff --cc drivers/net/ethernet/renesas/sh_eth.c
Simple merge

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

diff --cc include/linux/mlx5/device.h
Simple merge

diff --cc include/linux/mlx5/driver.h
Simple merge

diff --cc include/linux/mlx5/mlx5_ifc.h
Simple merge

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

diff --cc net/socket.c
Simple merge