Re: linux-next: manual merge of the net-next tree with the nettree

From	Ido Schimmel <idosch@mellanox.com>
Newsgroups	linux.kernel
Subject	Re: linux-next: manual merge of the net-next tree with the nettree
Date	2016-01-12 12:50 +0100
Message-ID	<qQ5Cy-jP-7@gated-at.bofh.it> (permalink)
References	<qPWIV-2PA-7@gated-at.bofh.it>
Organization	linux.* mail to news gateway

Show all headers | View raw

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!

Back to linux.kernel | Previous | Next — Previous in thread | Find similar | Unroll thread

Thread

linux-next: manual merge of the net-next tree with the nettree Stephen Rothwell <sfr@canb.auug.org.au> - 2016-01-12 03:20 +0100
  Re: linux-next: manual merge of the net-next tree with the nettree Ido Schimmel <idosch@mellanox.com> - 2016-01-12 12:50 +0100

csiph-web