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

From: Stephen Rothwell <[email-masked]>
Date: Mon, 17 Jun 2019 12:19:59 +1000

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 encap mode")

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 include/linux/mlx5/eswitch.h
index e9a55c0d50fd,174eec0871d9..000000000000
--- a/include/linux/mlx5/eswitch.h
+++ b/include/linux/mlx5/eswitch.h
@@@ -61,5 -62,16 +62,16 @@@ void *mlx5_eswitch_uplink_get_proto_dev
  u8 mlx5_eswitch_mode(struct mlx5_eswitch *esw);
  struct mlx5_flow_handle *
  mlx5_eswitch_add_send_to_vport_rule(struct mlx5_eswitch *esw,
 -				    int vport, u32 sqn);
 +				    u16 vport_num, u32 sqn);
+ 
+ #ifdef CONFIG_MLX5_ESWITCH
+ enum devlink_eswitch_encap_mode
+ mlx5_eswitch_get_encap_mode(const struct mlx5_core_dev *dev);
+ #else  /* CONFIG_MLX5_ESWITCH */
+ static inline enum devlink_eswitch_encap_mode
+ mlx5_eswitch_get_encap_mode(const struct mlx5_core_dev *dev)
+ {
+ 	return DEVLINK_ESWITCH_ENCAP_MODE_NONE;
+ }
+ #endif /* CONFIG_MLX5_ESWITCH */
  #endif