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: 1630 bytes --]

Hi all,

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

  include/linux/mlx5/driver.h

between commits:

  c8e350e62fc5 ("net/mlx5e: Make TC and IPsec offloads mutually exclusive on a netdev")
  1f507e80c700 ("net/mlx5: Expose NIC temperature via hardware monitoring kernel API")

from the net-next tree and commits:

  e26051386a94 ("net/mlx5e: Move MACsec flow steering and statistics database from ethernet to core")
  17c5c415b9cb ("net/mlx5: Add RoCE MACsec steering infrastructure in core")

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 e1c7e502a4fc,728bcd6d184c..000000000000
--- a/include/linux/mlx5/driver.h
+++ b/include/linux/mlx5/driver.h
@@@ -806,9 -804,12 +806,14 @@@ struct mlx5_core_dev 
  	struct mlx5_rsc_dump    *rsc_dump;
  	u32                      vsc_addr;
  	struct mlx5_hv_vhca	*hv_vhca;
 -	struct mlx5_thermal	*thermal;
 +	struct mlx5_hwmon	*hwmon;
 +	u64			num_block_tc;
 +	u64			num_block_ipsec;
+ #ifdef CONFIG_MLX5_MACSEC
+ 	struct mlx5_macsec_fs *macsec_fs;
+ 	/* MACsec notifier chain to sync MACsec core and IB database */
+ 	struct blocking_notifier_head macsec_nh;
+ #endif
  };
  
  struct mlx5_db {

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