Messages in this thread | | | Date | Tue, 12 Jan 2016 11:12:33 +0200 | From | Ido Schimmel <> | Subject | Re: linux-next: manual merge of the net-next tree with the nettree |
| |
Tue, Jan 12, 2016 at 04:15:07AM IST, sfr@canb.auug.org.au wrote: >Hi all, > >Today's linux-next merge of the net-next tree got a conflict in: > > drivers/net/ethernet/mellanox/mlxsw/spectrum.h > >between commit: > > 366ce6031529 ("mlxsw: spectrum: Add FDB lock to prevent session interleaving") > >from the net tree and commit: > > 0d65fc13042f ("mlxsw: spectrum: Implement LAG port join/leave") > >from the net-next tree. > >I fixed it up (see below) and can carry the fix as necessary (no action >is required).
Acked-by: Ido Schimmel <idosch@mellanox.com>
Thanks!
| |