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>

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/infiniband/core/cm.c
Simple merge

diff --cc drivers/infiniband/core/uverbs_main.c
Simple merge

diff --cc drivers/infiniband/hw/mlx5/qp.c
Simple merge

diff --cc drivers/infiniband/sw/rdmavt/qp.c
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlx5/core/en.h
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlx5/core/en/tc_ct.c
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlx5/core/en_main.c
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlx5/core/en_tc.c
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlx5/core/eswitch.h
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlx5/core/health.c
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlx5/core/steering/dr_send.c
index c4ed25b,18719ac..b8d97d4
--- 1/drivers/net/ethernet/mellanox/mlx5/core/steering/dr_send.c
--- 2/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);
  

diff --cc net/core/dev.c
Simple merge