Merge tag 'v5.15' into rdma.git for-next

Pull in the accepted for-rc patches as the next merge needs a newer base.

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

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

diff --cc drivers/infiniband/hw/irdma/uk.c
Simple merge

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

diff --cc drivers/infiniband/hw/mlx5/mr.c
index 221f094,22e2f4d..157d862
--- 1/drivers/infiniband/hw/mlx5/mr.c
--- 2/drivers/infiniband/hw/mlx5/mr.c
+++ b/drivers/infiniband/hw/mlx5/mr.c
@@@ -1334,9 -1339,8 +1334,8 @@@ static struct mlx5_ib_mr *reg_create(st
                goto err_2;
        }
        mr->mmkey.type = MLX5_MKEY_MR;
-       mr->desc_size = sizeof(struct mlx5_mtt);
        mr->umem = umem;
 -      set_mr_fields(dev, mr, umem->length, access_flags);
 +      set_mr_fields(dev, mr, umem->length, access_flags, iova);
        kvfree(in);
  
        mlx5_ib_dbg(dev, "mkey = 0x%x\n", mr->mmkey.key);

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

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

diff --cc include/linux/mlx5/driver.h
Simple merge