From: Jason Gunthorpe <jgg@mellanox.com>
Date: Thu, 21 May 2020 20:07:21 +0000 (-0300)
Subject: Merge tag 'v5.7-rc6' into rdma.git for-next
X-Git-Tag: v5.8-rc1~127^2~75
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=eafd47fc200ee759c0e8d205b9cc7342bd0f4199;p=linux-2.6-block.git

Merge tag 'v5.7-rc6' into rdma.git for-next

Linux 5.7-rc6

Conflict in drivers/net/ethernet/mellanox/mlx5/core/steering/dr_send.c
resolved by deleting dr_cq_event, matching how netdev resolved it.

Required for dependencies in the following patches.

Signed-off-by: Jason Gunthorpe <jgg@mellanox.com>
---

eafd47fc200ee759c0e8d205b9cc7342bd0f4199
diff --cc drivers/net/ethernet/mellanox/mlx5/core/steering/dr_send.c
index c4ed25bb9ac8,18719acb7e54..b8d97d44be7b
--- a/drivers/net/ethernet/mellanox/mlx5/core/steering/dr_send.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/steering/dr_send.c
@@@ -693,6 -689,18 +693,12 @@@ static int dr_prepare_qp_to_rts(struct 
  	return 0;
  }
  
 -static void dr_cq_event(struct mlx5_core_cq *mcq,
 -			enum mlx5_event event)
 -{
 -	pr_info("CQ event %u on CQ #%u\n", event, mcq->cqn);
 -}
 -
+ static void dr_cq_complete(struct mlx5_core_cq *mcq,
+ 			   struct mlx5_eqe *eqe)
+ {
+ 	pr_err("CQ completion CQ: #%u\n", mcq->cqn);
+ }
+ 
  static struct mlx5dr_cq *dr_create_cq(struct mlx5_core_dev *mdev,
  				      struct mlx5_uars_page *uar,
  				      size_t ncqe)
@@@ -753,6 -761,9 +759,8 @@@
  	pas = (__be64 *)MLX5_ADDR_OF(create_cq_in, in, pas);
  	mlx5_fill_page_frag_array(&cq->wq_ctrl.buf, pas);
  
 -	cq->mcq.event = dr_cq_event;
+ 	cq->mcq.comp  = dr_cq_complete;
+ 
  	err = mlx5_core_create_cq(mdev, &cq->mcq, in, inlen, out, sizeof(out));
  	kvfree(in);