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/infiniband/hw/mlx5/qp.c between commit c7a08ac7ee68
("net/mlx5_core: Update device capabilities handling") from Linus' tree
and commit f83b42636a91 ("IB/mlx5: Remove duplicate code from
mlx5_set_path") 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/infiniband/hw/mlx5/qp.c
index dbfe498870c1,f1b49e024664..000000000000
--- a/drivers/infiniband/hw/mlx5/qp.c
+++ b/drivers/infiniband/hw/mlx5/qp.c
@@@ -1317,6 -1302,11 +1317,11 @@@ static int mlx5_set_path(struct mlx5_ib
  	path->rlid	= cpu_to_be16(ah->dlid);
  
  	if (ah->ah_flags & IB_AH_GRH) {
 -		if (ah->grh.sgid_index >= dev->mdev->caps.port[port - 1].gid_table_len) {
++		if (ah->grh.sgid_index >= gen->port[port - 1].gid_table_len) {
+ 			pr_err(KERN_ERR "sgid_index (%u) too large. max is %d\n",
 -			       ah->grh.sgid_index, dev->mdev->caps.port[port - 1].gid_table_len);
++			       ah->grh.sgid_index, gen->port[port - 1].gid_table_len);
+ 			return -EINVAL;
+ 		}
  		path->grh_mlid |= 1 << 7;
  		path->mgid_index = ah->grh.sgid_index;
  		path->hop_limit  = ah->grh.hop_limit;

Attachment: signature.asc
Description: PGP signature