linux-next: manual merge of the infiniband tree with Linus' tree

[Stephen Rothwell]

Hi all,

Today's linux-next merge of the infiniband tree got a conflict in
drivers/net/ethernet/mellanox/mlx4/mlx4.h between commit 23537b732f5d
("net/mlx4_core: Use firmware driven flow steering hash mode") from
Linus' tree and commit e448834e3545 ("mlx4_core: Enable memory windows in
{INIT, QUERY}_HCA") from the infiniband tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

diff --cc drivers/net/ethernet/mellanox/mlx4/mlx4.h
index ed4a695,8b75d5e..0000000
--- a/drivers/net/ethernet/mellanox/mlx4/mlx4.h
+++ b/drivers/net/ethernet/mellanox/mlx4/mlx4.h
@@@ -60,6 -60,13 +60,8 @@@
  #define MLX4_FS_MGM_LOG_ENTRY_SIZE	7
  #define MLX4_FS_NUM_MCG			(1 << 17)
  
+ #define INIT_HCA_TPT_MW_ENABLE          (1 << 7)
+ 
 -enum {
 -	MLX4_FS_L2_HASH = 0,
 -	MLX4_FS_L2_L3_L4_HASH,
 -};
 -
  #define MLX4_NUM_UP		8
  #define MLX4_NUM_TC		8
  #define MLX4_RATELIMIT_UNITS 3 /* 100 Mbps */

Attachment: pgp00000.pgp
Description: PGP signature