Hi all,

Today's linux-next merge of the mlx5-next tree got a conflict in:

  drivers/net/ethernet/mellanox/mlx5/core/eswitch.h

between commit:

  520369ef43a8 ("net/mlx5: Support disabling host PFs")

from the net-next tree and commit:

  1baf30426553 ("net/mlx5: E-Switch, Set/Query hca cap via vhca id")

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.h
index 6c72080ac2a1,f47389629c62..000000000000
--- a/drivers/net/ethernet/mellanox/mlx5/core/eswitch.h
+++ b/drivers/net/ethernet/mellanox/mlx5/core/eswitch.h
@@@ -968,11 -975,12 +977,18 @@@ static inline bool mlx5_eswitch_block_i
  
  static inline void mlx5_eswitch_unblock_ipsec(struct mlx5_core_dev *dev) {}
  
 +static inline bool
 +mlx5_esw_host_functions_enabled(const struct mlx5_core_dev *dev)
 +{
 +	return true;
 +}
++
+ static inline bool
+ mlx5_esw_vport_vhca_id(struct mlx5_eswitch *esw, u16 vportn, u16 *vhca_id)
+ {
+ 	return -EOPNOTSUPP;
+ }
+ 
  #endif /* CONFIG_MLX5_ESWITCH */
  
  #endif /* __MLX5_ESWITCH_H__ */