mirror of https://gitee.com/openkylin/linux.git
4e8f2fc1a5
Two trivial overlapping changes conflicts in MPLS and mlx5. Signed-off-by: David S. Miller <davem@davemloft.net> |
||
---|---|---|
.. | ||
Kconfig | ||
Makefile | ||
mtk_eth_soc.c | ||
mtk_eth_soc.h |