Subject: linux-next: manual merge of the mlx5-next tree with Linus' tree

From: Stephen Rothwell <[email-masked]>
Date: Tue, 2 Jul 2019 13:08:28 +1000

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/mlx5: E-Switch, Use correct flags when configuring vlan")

from the mlx5-next tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc drivers/net/ethernet/mellanox/mlx5/core/eswitch.c
index 67e76979bb42,89f52370e770..000000000000
--- a/drivers/net/ethernet/mellanox/mlx5/core/eswitch.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/eswitch.c
@@@ -1552,7 -1552,8 +1552,8 @@@ static void node_guid_gen_from_mac(u64 
  static void esw_apply_vport_conf(struct mlx5_eswitch *esw,
  				 struct mlx5_vport *vport)
  {
 -	int vport_num = vport->vport;
 +	u16 vport_num = vport->vport;
+ 	int flags;
  
  	if (esw->manager_vport == vport_num)
  		return;