Two trivial overlapping changes conflicts in MPLS and mlx5. Signed-off-by: David S. Miller <davem@davemloft.net> |
||
---|---|---|
.. | ||
mlx4 | ||
mlx5/core | ||
mlxsw | ||
Kconfig | ||
Makefile |
Two trivial overlapping changes conflicts in MPLS and mlx5. Signed-off-by: David S. Miller <davem@davemloft.net> |
||
---|---|---|
.. | ||
mlx4 | ||
mlx5/core | ||
mlxsw | ||
Kconfig | ||
Makefile |