pop

diff --git a/meta b/meta
index e94d92e4596819ff2cc90fb8be375c5b51393e4e..6e9fa6bbabb1d799e4f14ca353399ebff43d5a18 100644 (file)
--- a/meta
+++ b/meta
@@ -1,6 +1,6 @@
 Version: 1
-Previous: a439815734e8666f2a3d20bda4086caf3462b4f5
-Head: 38210187a47c8ff74392afdc5a792442309ebfe8
+Previous: cb2ce7d3948aed81e9b28e32ddeeb6033491f874
+Head: 04459983f9437fd73087b70a8c4d176ff9da744b
 Applied:
   af_ib: c3016259608d73bcdc527c1513bbc6e62f20b825
   use_port: 766aea8efed96bf78c8929e080985acb70cce602
@@ -10,8 +10,8 @@ Applied:
   qp_type: e31ec93f02a7643e6f72bf918e44c9fca29dae23
   ucma_create_ps_ib: ad1ac06f554fd9be3f948747dbd57ffdc34765e6
   ucma_event_ps_ib: 38210187a47c8ff74392afdc5a792442309ebfe8
+  ps_ib_qkey: 04459983f9437fd73087b70a8c4d176ff9da744b
 Unapplied:
-  ps_ib_qkey: 5fc4173815ccd4895001bcdbd6111ca6fa06fb44
   bind_af_ib: a549d32972eb325e3fd02d5b12039e9c5f9c8c89
   cma_resolve_loopback: 9c437af437c875958211936bc66e8f2fe022a6dd
   restrict_af_ib_loopback: f0dbd8bdce1f1c2a8cd9ee9914f4acf64a9dc2d5

diff --git a/patches/ps_ib_qkey b/patches/ps_ib_qkey
index 6697116075f00ab1a3dc1f994d5232d78f3be6bd..f5d6f4e63de890bbdb090a285ec762e029feef82 100644 (file)
--- a/patches/ps_ib_qkey
+++ b/patches/ps_ib_qkey
@@ -1,5 +1,5 @@
-Bottom: c07911133fe048d9066b6afc923767db0133ed52
-Top:    fabe602ba12ef9a9d7da50afceb6e287f9313474
+Bottom: 26b5b71a0a7acdc75d2b1cd591e4c5eb59dabc6c
+Top:    a8c150d03dcbac61f2df335b55a6c0a0bb15522b
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2010-04-06 17:22:12 -0700
 
@@ -16,10 +16,10 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 ---
 
 diff --git a/drivers/infiniband/core/cma.c b/drivers/infiniband/core/cma.c
-index ccf47c6..f8ca424 100644
+index d6b689f..fba593f 100644
 --- a/drivers/infiniband/core/cma.c
 +++ b/drivers/infiniband/core/cma.c
-@@ -293,16 +293,25 @@ static void cma_detach_from_dev(struct rdma_id_private *id_priv)
+@@ -294,16 +294,25 @@ static void cma_detach_from_dev(struct rdma_id_private *id_priv)
        id_priv->cma_dev = NULL;
  }
  
@@ -47,7 +47,7 @@ index ccf47c6..f8ca424 100644
                id_priv->qkey = RDMA_UDP_QKEY;
                break;
        case RDMA_PS_IPOIB:
-@@ -565,7 +574,7 @@ static int cma_ib_init_qp_attr(struct rdma_id_private *id_priv,
+@@ -566,7 +575,7 @@ static int cma_ib_init_qp_attr(struct rdma_id_private *id_priv,
        *qp_attr_mask = IB_QP_STATE | IB_QP_PKEY_INDEX | IB_QP_PORT;
  
        if (id_priv->id.qp_type == IB_QPT_UD) {
@@ -56,7 +56,7 @@ index ccf47c6..f8ca424 100644
                if (ret)
                        return ret;
  
-@@ -2302,15 +2311,10 @@ static int cma_sidr_rep_handler(struct ib_cm_id *cm_id,
+@@ -2304,15 +2313,10 @@ static int cma_sidr_rep_handler(struct ib_cm_id *cm_id,
                        event.status = ib_event->param.sidr_rep_rcvd.status;
                        break;
                }
@@ -74,7 +74,7 @@ index ccf47c6..f8ca424 100644
                        break;
                }
                ib_init_ah_from_path(id_priv->id.device, id_priv->id.port_num,
-@@ -2583,7 +2587,7 @@ static int cma_accept_iw(struct rdma_id_private *id_priv,
+@@ -2585,7 +2589,7 @@ static int cma_accept_iw(struct rdma_id_private *id_priv,
  }
  
  static int cma_send_sidr_rep(struct rdma_id_private *id_priv,
@@ -83,7 +83,7 @@ index ccf47c6..f8ca424 100644
                             const void *private_data, int private_data_len)
  {
        struct ib_cm_sidr_rep_param rep;
-@@ -2592,7 +2596,7 @@ static int cma_send_sidr_rep(struct rdma_id_private *id_priv,
+@@ -2594,7 +2598,7 @@ static int cma_send_sidr_rep(struct rdma_id_private *id_priv,
        memset(&rep, 0, sizeof rep);
        rep.status = status;
        if (status == IB_SIDR_SUCCESS) {
@@ -92,7 +92,7 @@ index ccf47c6..f8ca424 100644
                if (ret)
                        return ret;
                rep.qp_num = id_priv->qp_num;
-@@ -2622,6 +2626,7 @@ int rdma_accept(struct rdma_cm_id *id, struct rdma_conn_param *conn_param)
+@@ -2624,6 +2628,7 @@ int rdma_accept(struct rdma_cm_id *id, struct rdma_conn_param *conn_param)
        case RDMA_TRANSPORT_IB:
                if (id->qp_type == IB_QPT_UD)
                        ret = cma_send_sidr_rep(id_priv, IB_SIDR_SUCCESS,
@@ -100,7 +100,7 @@ index ccf47c6..f8ca424 100644
                                                conn_param->private_data,
                                                conn_param->private_data_len);
                else if (conn_param)
-@@ -2682,7 +2687,7 @@ int rdma_reject(struct rdma_cm_id *id, const void *private_data,
+@@ -2684,7 +2689,7 @@ int rdma_reject(struct rdma_cm_id *id, const void *private_data,
        switch (rdma_node_get_transport(id->device->node_type)) {
        case RDMA_TRANSPORT_IB:
                if (id->qp_type == IB_QPT_UD)
@@ -109,7 +109,7 @@ index ccf47c6..f8ca424 100644
                                                private_data, private_data_len);
                else
                        ret = ib_send_cm_rej(id_priv->cm_id.ib,
-@@ -2743,6 +2748,8 @@ static int cma_ib_mc_handler(int status, struct ib_sa_multicast *multicast)
+@@ -2745,6 +2750,8 @@ static int cma_ib_mc_handler(int status, struct ib_sa_multicast *multicast)
            cma_disable_callback(id_priv, CMA_ADDR_RESOLVED))
                return 0;
  
@@ -119,10 +119,10 @@ index ccf47c6..f8ca424 100644
        if (!status && id_priv->id.qp)
                status = ib_attach_mcast(id_priv->id.qp, &multicast->rec.mgid,
 diff --git a/drivers/infiniband/core/ucma.c b/drivers/infiniband/core/ucma.c
-index 723fe83..07afd38 100644
+index 9393c31..3e66a94 100644
 --- a/drivers/infiniband/core/ucma.c
 +++ b/drivers/infiniband/core/ucma.c
-@@ -655,7 +655,8 @@ out:
+@@ -656,7 +656,8 @@ out:
        return ret;
  }
  
@@ -132,7 +132,7 @@ index 723fe83..07afd38 100644
                                 struct rdma_ucm_conn_param *src)
  {
        dst->private_data = src->private_data;
-@@ -667,6 +668,10 @@ static void ucma_copy_conn_param(struct rdma_conn_param *dst,
+@@ -668,6 +669,10 @@ static void ucma_copy_conn_param(struct rdma_conn_param *dst,
        dst->rnr_retry_count = src->rnr_retry_count;
        dst->srq = src->srq;
        dst->qp_num = src->qp_num;
@@ -143,7 +143,7 @@ index 723fe83..07afd38 100644
  }
  
  static ssize_t ucma_connect(struct ucma_file *file, const char __user *inbuf,
-@@ -687,7 +692,7 @@ static ssize_t ucma_connect(struct ucma_file *file, const char __user *inbuf,
+@@ -688,7 +693,7 @@ static ssize_t ucma_connect(struct ucma_file *file, const char __user *inbuf,
        if (IS_ERR(ctx))
                return PTR_ERR(ctx);
  
@@ -152,7 +152,7 @@ index 723fe83..07afd38 100644
        ret = rdma_connect(ctx->cm_id, &conn_param);
        ucma_put_ctx(ctx);
        return ret;
-@@ -731,7 +736,7 @@ static ssize_t ucma_accept(struct ucma_file *file, const char __user *inbuf,
+@@ -732,7 +737,7 @@ static ssize_t ucma_accept(struct ucma_file *file, const char __user *inbuf,
  
        if (cmd.conn_param.valid) {
                ctx->uid = cmd.uid;
@@ -162,10 +162,10 @@ index 723fe83..07afd38 100644
        } else
                ret = rdma_accept(ctx->cm_id, NULL);
 diff --git a/include/rdma/rdma_cm.h b/include/rdma/rdma_cm.h
-index 68e73d1..363e7a3 100644
+index 932c192..ce9c933 100644
 --- a/include/rdma/rdma_cm.h
 +++ b/include/rdma/rdma_cm.h
-@@ -99,6 +99,7 @@ struct rdma_conn_param {
+@@ -98,6 +98,7 @@ struct rdma_conn_param {
        /* Fields below ignored if a QP is created on the rdma_cm_id. */
        u8 srq;
        u32 qp_num;