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> |
||
|---|---|---|
| .. | ||
| Kconfig | ||
| Makefile | ||
| xgene_enet_cle.c | ||
| xgene_enet_cle.h | ||
| xgene_enet_ethtool.c | ||
| xgene_enet_hw.c | ||
| xgene_enet_hw.h | ||
| xgene_enet_main.c | ||
| xgene_enet_main.h | ||
| xgene_enet_ring2.c | ||
| xgene_enet_ring2.h | ||
| xgene_enet_sgmac.c | ||
| xgene_enet_sgmac.h | ||
| xgene_enet_xgmac.c | ||
| xgene_enet_xgmac.h | ||