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

On Wed, Jun 26, 2019 at 9:09 PM Stephen Rothwell wrote: > > Hi all, > > Today's linux-next merge of the mlx5-next tree got a conflict in: > > drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c > > between commits: > > 955858009708 ("net/mlx5e: Fix number of vports for ingress ACL > co

linux-next: manual merge of the mlx5-next tree with the net-next tree

Hi all, Today's linux-next merge of the mlx5-next tree got a conflict in: drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c between commits: 955858009708 ("net/mlx5e: Fix number of vports for ingress ACL configuration") d4a18e16c570 ("net/mlx5e: Enable setting multiple match crit