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

[Stephen Rothwell]

Hi all,

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

  include/linux/mlx5/mlx5_ifc.h

between commit:

  048a403648fc ("net/mlx5: IFC updates for changing max EQs")

from the net tree and commit:

  99be56171fa9 ("net/mlx5e: SHAMPO, Re-enable HW-GRO")

from the net-next tree.

I fixed it up (I think, 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/mlx5_ifc.h
index 85310053a40d,66b921c81c0f..000000000000
--- a/include/linux/mlx5/mlx5_ifc.h
+++ b/include/linux/mlx5/mlx5_ifc.h
@@@ -2029,11 -2032,11 +2032,15 @@@ struct mlx5_ifc_cmd_hca_cap_2_bits 
  	u8	   pcc_ifa2[0x1];
  	u8	   reserved_at_3f1[0xf];
  
- 	u8	   reserved_at_400[0x40];
+ 	u8	   reserved_at_400[0x1];
+ 	u8	   min_mkey_log_entity_size_fixed_buffer_valid[0x1];
+ 	u8	   reserved_at_402[0x1e];
+ 
 -	u8	   reserved_at_420[0x3e0];
++	u8	   reserved_at_420[0x20];
 +
 +	u8	   reserved_at_440[0x8];
 +	u8	   max_num_eqs_24b[0x18];
 +	u8	   reserved_at_460[0x3a0];
  };
  
  enum mlx5_ifc_flow_destination_type {

Attachment: pgpnYbcQ1g6TO.pgp
Description: OpenPGP digital signature