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

For dependencies in next patches.

Resolve conflicts:
- Use uverbs_get_cleared_udata() with new cq allocation flow
- Continue to delete nes despite SPDX conflict
- Resolve list appends in mlx5_command_str()
- Use u16 for vport_rule stuff
- Resolve list appends in struct ib_client

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

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/infiniband/Kconfig
Simple merge

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

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

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

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

diff --cc drivers/infiniband/core/uverbs_cmd.c
index 9115330,63fe14c..750c4d4
--- 1/drivers/infiniband/core/uverbs_cmd.c
--- 2/drivers/infiniband/core/uverbs_cmd.c
+++ b/drivers/infiniband/core/uverbs_cmd.c
@@@ -1047,10 -1053,8 +1058,10 @@@ static struct ib_ucq_object *create_cq(
        return obj;
  
  err_cb:
-       ib_destroy_cq(cq);
+       ib_destroy_cq_user(cq, uverbs_get_cleared_udata(attrs));
 -
 +      cq = NULL;
 +err_free:
 +      kfree(cq);
  err_file:
        if (ev_file)
                ib_uverbs_release_ucq(attrs->ufile, ev_file, obj);

diff --cc drivers/infiniband/core/uverbs_std_types_cq.c
index 06b8c7d,07ea4e3..e39fe6a
--- 1/drivers/infiniband/core/uverbs_std_types_cq.c
--- 2/drivers/infiniband/core/uverbs_std_types_cq.c
+++ b/drivers/infiniband/core/uverbs_std_types_cq.c
@@@ -140,10 -135,8 +140,10 @@@ static int UVERBS_HANDLER(UVERBS_METHOD
  
        return 0;
  err_cq:
-       ib_destroy_cq(cq);
+       ib_destroy_cq_user(cq, uverbs_get_cleared_udata(attrs));
 -
 +      cq = NULL;
 +err_free:
 +      kfree(cq);
  err_event_file:
        if (ev_file)
                uverbs_uobject_put(ev_file_uobj);

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

diff --cc drivers/infiniband/hw/efa/efa_com_cmd.c
Simple merge

diff --cc drivers/infiniband/hw/efa/efa_verbs.c
Simple merge

diff --cc drivers/infiniband/hw/hfi1/pio.c
Simple merge

diff --cc drivers/infiniband/hw/hfi1/rc.c
Simple merge

diff --cc drivers/infiniband/hw/hfi1/tid_rdma.c
Simple merge

diff --cc drivers/infiniband/hw/hfi1/verbs.c
Simple merge

diff --cc drivers/infiniband/hw/hns/Kconfig
Simple merge

diff --cc drivers/infiniband/hw/hns/Makefile
Simple merge

diff --cc drivers/infiniband/hw/hns/hns_roce_hw_v1.c
index 2c0bc25,e068a02..056a687
--- 1/drivers/infiniband/hw/hns/hns_roce_hw_v1.c
--- 2/drivers/infiniband/hw/hns/hns_roce_hw_v1.c
+++ b/drivers/infiniband/hw/hns/hns_roce_hw_v1.c
@@@ -899,9 -894,12 +899,10 @@@ static void hns_roce_v1_release_lp_qp(s
                                i, ret);
        }
  
 -      ret = hns_roce_ib_destroy_cq(&free_mr->mr_free_cq->ib_cq, NULL);
 -      if (ret)
 -              dev_err(dev, "Destroy cq for mr_free failed(%d)!\n", ret);
 -
 +      hns_roce_ib_destroy_cq(&free_mr->mr_free_cq->ib_cq, NULL);
 +      kfree(&free_mr->mr_free_cq->ib_cq);
        hns_roce_dealloc_pd(&free_mr->mr_free_pd->ibpd, NULL);
+       kfree(&free_mr->mr_free_pd->ibpd);
  }
  
  static int hns_roce_db_init(struct hns_roce_dev *hr_dev)

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

diff --cc drivers/infiniband/hw/mlx5/ib_rep.h
Simple merge

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

diff --cc drivers/infiniband/hw/qib/qib_verbs.c
Simple merge

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

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

diff --cc drivers/infiniband/ulp/ipoib/Kconfig
Simple merge

diff --cc drivers/infiniband/ulp/isert/ib_isert.c
Simple merge

diff --cc drivers/infiniband/ulp/srp/ib_srp.c
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlx5/core/cmd.c
index 7d3aec9,e94686c..8cdd7e6
--- 1/drivers/net/ethernet/mellanox/mlx5/core/cmd.c
--- 2/drivers/net/ethernet/mellanox/mlx5/core/cmd.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/cmd.c
@@@ -628,7 -632,11 +632,11 @@@ const char *mlx5_command_str(int comman
        MLX5_COMMAND_STR_CASE(QUERY_MODIFY_HEADER_CONTEXT);
        MLX5_COMMAND_STR_CASE(ALLOC_MEMIC);
        MLX5_COMMAND_STR_CASE(DEALLOC_MEMIC);
 -      MLX5_COMMAND_STR_CASE(QUERY_HOST_PARAMS);
 +      MLX5_COMMAND_STR_CASE(QUERY_ESW_FUNCTIONS);
+       MLX5_COMMAND_STR_CASE(CREATE_UCTX);
+       MLX5_COMMAND_STR_CASE(DESTROY_UCTX);
+       MLX5_COMMAND_STR_CASE(CREATE_UMEM);
+       MLX5_COMMAND_STR_CASE(DESTROY_UMEM);
        default: return "unknown command opcode";
        }
  }

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

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

diff --cc drivers/net/ethernet/mellanox/mlx5/core/eswitch.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/main.c
Simple merge

diff --cc drivers/nvme/host/rdma.c
Simple merge

diff --cc include/linux/mlx5/eswitch.h
index 174eec0,cf226c1..ee1335a
--- 1/include/linux/mlx5/eswitch.h
--- 2/include/linux/mlx5/eswitch.h
+++ b/include/linux/mlx5/eswitch.h
@@@ -62,16 -59,5 +62,16 @@@ void *mlx5_eswitch_uplink_get_proto_dev
  u8 mlx5_eswitch_mode(struct mlx5_eswitch *esw);
  struct mlx5_flow_handle *
  mlx5_eswitch_add_send_to_vport_rule(struct mlx5_eswitch *esw,
-                                   int vport, u32 sqn);
+                                   u16 vport_num, u32 sqn);
 +
 +#ifdef CONFIG_MLX5_ESWITCH
 +enum devlink_eswitch_encap_mode
 +mlx5_eswitch_get_encap_mode(const struct mlx5_core_dev *dev);
 +#else  /* CONFIG_MLX5_ESWITCH */
 +static inline enum devlink_eswitch_encap_mode
 +mlx5_eswitch_get_encap_mode(const struct mlx5_core_dev *dev)
 +{
 +      return DEVLINK_ESWITCH_ENCAP_MODE_NONE;
 +}
 +#endif /* CONFIG_MLX5_ESWITCH */
  #endif

diff --cc include/net/devlink.h
Simple merge

diff --cc include/rdma/ib_verbs.h
index e2478b7,5487308..26e9c25
--- 1/include/rdma/ib_verbs.h
--- 2/include/rdma/ib_verbs.h
+++ b/include/rdma/ib_verbs.h
@@@ -2585,9 -2698,7 +2585,10 @@@ struct ib_client 
        const char *name;
        void (*add)   (struct ib_device *);
        void (*remove)(struct ib_device *, void *client_data);
+       void (*rename)(struct ib_device *dev, void *client_data);
 +      int (*get_nl_info)(struct ib_device *ibdev, void *client_data,
 +                         struct ib_client_nl_info *res);
 +      int (*get_global_nl_info)(struct ib_client_nl_info *res);
  
        /* Returns the net_dev belonging to this ib_client and matching the
         * given parameters.

diff --cc include/rdma/mr_pool.h
Simple merge

diff --cc include/rdma/rw.h
Simple merge

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