Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> writes:
> Today's linux-next merge of the net-next tree got conflicts in:
>
> drivers/net/ethernet/mellanox/mlxsw/spectrum.h
> drivers/net/ethernet/mellanox/mlxsw/spectrum.c
>
> between commit:
>
> 663f1b26f9c1 ("mlxsw: spectrum: Prevent duplicate mirrors")
>
> from the net tree and commit:
>
> a629ef210d89 ("mlxsw: spectrum: Move SPAN code to separate module")
>
> from the net-next tree.
>
> I fixed it up
Looks good.
Thanks,
Petr
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
