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

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

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/net/ethernet/ibm/emac/core.c
Simple merge

diff --cc drivers/net/ethernet/ibm/emac/emac.h
Simple merge

diff --cc drivers/net/ethernet/intel/i40e/i40e_main.c
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c
Simple merge

diff --cc drivers/net/ethernet/qlogic/qed/qed_rdma.c
Simple merge

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

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

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

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

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

diff --cc net/xfrm/xfrm_device.c
Simple merge

diff --cc net/xfrm/xfrm_state.c
Simple merge