Messages in this thread | | | From | Or Gerlitz <> | Date | Tue, 18 Dec 2018 00:01:57 +0200 | Subject | Re: linux-next: manual merge of the net-next tree with the net tree |
| |
On Mon, Dec 17, 2018 at 11:29 PM Saeed Mahameed <saeedm@dev.mellanox.co.il> wrote: > On Sun, Dec 16, 2018 at 4:25 PM Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> > I fixed it up (see below) and can carry the fix as necessary. This
> Looks good to me.
here too
> > Today's linux-next merge of the net-next tree got a conflict in: > > drivers/net/ethernet/mellanox/mlx5/core/en_tc.c > > between commit:
> > 154e62abe9cd ("net/mlx5e: Properly initialize flow attributes for slow path eswitch rule deletion") > > from the net tree and commit:
> > e88afe759a49 ("net/mlx5e: Err if asked to mirror a goto chain tc eswitch rule") > > e85e02bad29e ("net/mlx5: E-Switch, Rename esw attr mirror count field") > > from the net-next tree.
Just a note,
e88afe759a49 ("net/mlx5e: Err if asked to mirror a goto chain tc eswitch rule")i
s from net and not net-next
see it here [1] among the top 10 patches
https://git.kernel.org/pub/scm/linux/kernel/git/davem/net.git/log/?qt=grep&q=mlx5
| |