]> git.baikalelectronics.ru Git - kernel.git/commit
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
authorDavid S. Miller <davem@davemloft.net>
Thu, 25 Jan 2018 04:44:15 +0000 (23:44 -0500)
committerDavid S. Miller <davem@davemloft.net>
Thu, 25 Jan 2018 04:44:15 +0000 (23:44 -0500)
commit3376e9ea5f913080101f963ba9ba350901f29b19
treed3f2669d3abb1c53c2f364732e8122ce0f25e3da
parent39e14cba51f23cef9159062939d786c1c8052cf9
parent334d288e499570c91817f2153c97f32f57afbf45
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

Signed-off-by: David S. Miller <davem@davemloft.net>
13 files changed:
MAINTAINERS
drivers/net/ethernet/ibm/emac/core.c
drivers/net/ethernet/ibm/emac/emac.h
drivers/net/ethernet/intel/i40e/i40e_main.c
drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c
drivers/net/ethernet/qlogic/qed/qed_rdma.c
include/net/ipv6.h
include/net/pkt_cls.h
net/ipv4/xfrm4_mode_tunnel.c
net/ipv6/ip6_output.c
net/ipv6/xfrm6_mode_tunnel.c
net/xfrm/xfrm_device.c
net/xfrm/xfrm_state.c