mirror of
https://github.com/Fishwaldo/Star64_linux.git
synced 2025-06-10 00:28:16 +00:00
Two trivial overlapping changes conflicts in MPLS and mlx5. Signed-off-by: David S. Miller <davem@davemloft.net> |
||
---|---|---|
.. | ||
af_mpls.c | ||
internal.h | ||
Kconfig | ||
Makefile | ||
mpls_gso.c | ||
mpls_iptunnel.c |