mirror of https://gitee.com/openkylin/linux.git
e800072c18
In netdevice.h we removed the structure in net-next that is being changes in 'net'. In macsec.c and rtnetlink.c we have overlaps between fixes in 'net' and the u64 attribute changes in 'net-next'. The mlx5 conflicts have to do with vxlan support dependencies. Signed-off-by: David S. Miller <davem@davemloft.net> |
||
---|---|---|
.. | ||
Makefile | ||
netxen_nic.h | ||
netxen_nic_ctx.c | ||
netxen_nic_ethtool.c | ||
netxen_nic_hdr.h | ||
netxen_nic_hw.c | ||
netxen_nic_hw.h | ||
netxen_nic_init.c | ||
netxen_nic_main.c |