On Thu, Mar 03, 2016 at 11:26:23AM -0500, Doug Ledford wrote: > I took the later version of the patch, but I had to fix it up due to > conflicts with both the rereg_me patchset and the mmkey cleanup > patchset. Please double check this in the mlx5 branch of my github repo > to make sure it's all good. Looks like we'll need the one liner below to get the manually applied patch to compile, but otherwise it looks fine to me. diff --git a/drivers/infiniband/hw/mlx5/mr.c b/drivers/infiniband/hw/mlx5/mr.c index f1464b8..4d5bff1 100644 --- a/drivers/infiniband/hw/mlx5/mr.c +++ b/drivers/infiniband/hw/mlx5/mr.c @@ -1201,7 +1201,7 @@ static int unreg_umr(struct mlx5_ib_dev *dev, struct mlx5_ib_mr *mr) mlx5_ib_init_umr_context(&umr_context); - umrwr.wr.wr_cqe = &umr_context.cqe + umrwr.wr.wr_cqe = &umr_context.cqe; prep_umr_unreg_wqe(dev, &umrwr.wr, mr->mmkey.key); down(&umrc->sem); -- To unsubscribe from this list: send the line "unsubscribe linux-rdma" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html