From: Jason Gunthorpe <jgg@nvidia.com>
Date: Mon, 1 Nov 2021 17:49:20 +0000 (-0300)
Subject: Merge tag 'v5.15' into rdma.git for-next
X-Git-Tag: v5.16-rc1~133^2~3
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a2a2a69d144d66e0c36697da062b3949e3c2c870;p=thirdparty%2Fkernel%2Flinux.git

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>
---

a2a2a69d144d66e0c36697da062b3949e3c2c870
diff --cc drivers/infiniband/hw/mlx5/mr.c
index 221f0949794e3,22e2f4d79743d..157d862fb8642
--- a/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);