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

Overlapping changes in drivers/net/phy/marvell.c, bug fix in 'net'
restricting a HW workaround alongside cleanups in 'net-next'.

Signed-off-by: David S. Miller <davem@davemloft.net>

diff --cc drivers/net/ethernet/8390/ax88796.c
Simple merge

diff --cc drivers/net/ethernet/emulex/benet/be_main.c
Simple merge

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

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

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

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

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

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

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

diff --cc include/net/dst.h
Simple merge

diff --cc include/net/ip_fib.h
Simple merge

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

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

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

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