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

[Stephen Rothwell]

Hi all,

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

  include/linux/mlx5/device.h

between commit:

  ac5f395685bd ("net/mlx5: SF, Implement peer devlink set for SF representor devlink port")

from the net-next tree and commit:

  0d293714ac32 ("RDMA/mlx5: Send events from IB driver about device affiliation state")

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/device.h
index 8fbe22de16ef,26333d602a50..000000000000
--- a/include/linux/mlx5/device.h
+++ b/include/linux/mlx5/device.h
@@@ -366,7 -366,8 +366,9 @@@ enum mlx5_driver_event 
  	MLX5_DRIVER_EVENT_UPLINK_NETDEV,
  	MLX5_DRIVER_EVENT_MACSEC_SA_ADDED,
  	MLX5_DRIVER_EVENT_MACSEC_SA_DELETED,
 +	MLX5_DRIVER_EVENT_SF_PEER_DEVLINK,
+ 	MLX5_DRIVER_EVENT_AFFILIATION_DONE,
+ 	MLX5_DRIVER_EVENT_AFFILIATION_REMOVED,
  };
  
  enum {

Attachment: pgpRWnMOGDsmP.pgp
Description: OpenPGP digital signature