On Tue, Jul 02, 2019 at 01:13:27PM +1000, 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 commit:
>
> 955858009708 ("net/mlx5e: Fix number of vports for ingress ACL
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 commit:
955858009708 ("net/mlx5e: Fix number of vports for ingress ACL configuration")
from Linus' tree and commit:
062f4bf4aab5 ("net/mlx5: E-Swi
Hi all,
Today's linux-next merge of the mlx5-next tree got conflicts in:
drivers/net/ethernet/mellanox/mlx5/core/eswitch.c
between commits:
02f3afd97556 ("net/mlx5: E-Switch, Correct type to u16 for vport_num and int
for vport_index")
from Linus' tree and commit:
5f5d2536be8d ("net/mlx
Hi all,
On Mon, 17 Jun 2019 12:19:59 +1000 Stephen Rothwell
wrote:
>
> Hi Leon,
>
> Today's linux-next merge of the mlx5-next tree got a conflict in:
>
> include/linux/mlx5/eswitch.h
>
> between commit:
>
> 02f3afd97556 ("net/mlx5: E-Switch, Correct type to u16 for vport_num and
> int f
On Mon, Jun 17, 2019 at 12:19:59PM +1000, Stephen Rothwell wrote:
> Hi Leon,
>
> Today's linux-next merge of the mlx5-next tree got a conflict in:
>
> include/linux/mlx5/eswitch.h
>
> between commit:
>
> 02f3afd97556 ("net/mlx5: E-Switch, Correct type to u16 for vport_num and
> int for vport_i
Hi Leon,
Today's linux-next merge of the mlx5-next tree got a conflict in:
include/linux/mlx5/eswitch.h
between commit:
02f3afd97556 ("net/mlx5: E-Switch, Correct type to u16 for vport_num and int
for vport_index")
from Linus' tree and commit:
82b11f071936 ("net/mlx5: Expose eswitch en
6 matches
Mail list logo
