Merge branch 'k.o/for-4.13-rc' into k.o/for-next

Pick up -rc fixes.

Signed-off-by: Doug Ledford <dledford@redhat.com>

diff --cc drivers/infiniband/core/uverbs_cmd.c
index dc7d773a96ec82c0252f6e879af14df9c1182ec6,739bd69ef1d47fa163ea9f57cf86cbbf09f5fba7..59696f568f537793b1ea69b382b1f211f12769a0
--- 1/drivers/infiniband/core/uverbs_cmd.c
--- 2/drivers/infiniband/core/uverbs_cmd.c
+++ b/drivers/infiniband/core/uverbs_cmd.c
@@@ -2009,10 -1982,10 +2011,11 @@@ static int modify_qp(struct ib_uverbs_f
        rdma_ah_set_static_rate(&attr->ah_attr, cmd->base.dest.static_rate);
        rdma_ah_set_port_num(&attr->ah_attr,
                             cmd->base.dest.port_num);
 +      rdma_ah_set_make_grd(&attr->ah_attr, false);
  
-       attr->alt_ah_attr.type = rdma_ah_find_type(qp->device,
-                                                  cmd->base.dest.port_num);
+       if (cmd->base.attr_mask & IB_QP_ALT_PATH)
+               attr->alt_ah_attr.type =
+                       rdma_ah_find_type(qp->device, cmd->base.dest.port_num);
        if (cmd->base.alt_dest.is_global) {
                rdma_ah_set_grh(&attr->alt_ah_attr, NULL,
                                cmd->base.alt_dest.flow_label,

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

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

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

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