Messages in this thread | | | From | Petr Machata <> | Subject | Re: linux-next: manual merge of the net-next tree with the net tree | Date | Tue, 13 Mar 2018 12:41:46 +0200 |
| |
Stephen Rothwell <sfr@canb.auug.org.au> 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
| |