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

[Stephen Rothwell <sfr@canb.auug.org.au>]

[-- Attachment #1: Type: text/plain, Size: 1204 bytes --]

Hi all,

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

  include/linux/mlx5/driver.h

between commit:

  fe298bdf6f65 ("net/mlx5: Prepare for fast crypto key update if hardware supports it")

from the net-next tree and commit:

  2fd0e75727a8 ("net/mlx5e: Propagate an internal event in case uplink netdev changes")

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/driver.h
index 234334194b38,cc48aa308269..000000000000
--- a/include/linux/mlx5/driver.h
+++ b/include/linux/mlx5/driver.h
@@@ -674,7 -675,7 +675,8 @@@ struct mlx5e_resources 
  	} hw_objs;
  	struct devlink_port dl_port;
  	struct net_device *uplink_netdev;
 +	struct mlx5_crypto_dek_priv *dek_priv;
+ 	struct mutex uplink_netdev_lock;
  };
  
  enum mlx5_sw_icm_type {

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]