refresh

diff --git a/meta b/meta
index f5bd6a0d98968303dbdcb7fe7b45ed91675e81e2..e89cbf26890e082188a4182ff7aa2e30ec78d477 100644 (file)
--- a/meta
+++ b/meta
@@ -1,9 +1,8 @@
 Version: 1
-Previous: b1009ab823fbbc43b6c1c24bb8956f5a9c74b3dd
-Head: 70e72c91e61ba3f6b055e2a10b58bdddf108ad2b
+Previous: 4101762a577936f36224781ddcc10693ee9e2dd7
+Head: b3a011ac478f0c06eb627d5f9956aadb59221d25
 Applied:
   verbs-ext: 6fbf2b29ca68fc10b7ee47dc0c09f54db0b32320
-  xrcd: a315cce4aec1ab8e31854ccc021088ed8ce771fb
-  refresh-temp: 70e72c91e61ba3f6b055e2a10b58bdddf108ad2b
+  xrcd: b3a011ac478f0c06eb627d5f9956aadb59221d25
 Unapplied:
 Hidden:

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 04b23af..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,28 +0,0 @@
-Bottom: 8a88265fe1dfe8a615be3289a83379f981658c89
-Top:    a3d42910ddc31392396b0254af9e3fb3fbafa501
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2012-09-12 11:05:23 -0700
-
-Refresh of xrcd
-
----
-
-diff --git a/src/verbs.c b/src/verbs.c
-index 4e314dc..a693ecb 100644
---- a/src/verbs.c
-+++ b/src/verbs.c
-@@ -427,12 +427,12 @@ struct ibv_qp *__ibv_create_qp(struct ibv_pd *pd,
-       struct ibv_qp *qp = pd->context->ops.create_qp(pd, qp_init_attr);
- 
-       if (qp) {
--              qp->context          = context;
-+              qp->context          = context;
-               qp->qp_context       = qp_init_attr->qp_context;
-               qp->pd               = pd;
-               qp->send_cq          = qp_init_attr->send_cq;
-               qp->recv_cq          = qp_init_attr->recv_cq;
--              qp->srq              = qp_init_attr->srq;
-+              qp->srq              = qp_init_attr->srq;
-               qp->qp_type          = qp_init_attr->qp_type;
-               qp->state            = IBV_QPS_RESET;
-               qp->events_completed = 0;

diff --git a/patches/xrcd b/patches/xrcd
index bb479042384dabd3f7797cef9d399adadb44f07f..8cfad1445d68b3d5ac68a8ad153a1f8786fe6bc9 100644 (file)
--- a/patches/xrcd
+++ b/patches/xrcd
@@ -1,5 +1,5 @@
 Bottom: b2b2b839d978bb240b0641dff8459eaee9553d17
-Top:    8a88265fe1dfe8a615be3289a83379f981658c89
+Top:    a3d42910ddc31392396b0254af9e3fb3fbafa501
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-09-07 14:38:07 -0700
 
@@ -226,7 +226,7 @@ index ee9adea..9a15f3f 100644
 +              
  } IBVERBS_1.0;
 diff --git a/src/verbs.c b/src/verbs.c
-index b5938f2..4e314dc 100644
+index b5938f2..a693ecb 100644
 --- a/src/verbs.c
 +++ b/src/verbs.c
 @@ -154,6 +154,32 @@ int __ibv_dealloc_pd(struct ibv_pd *pd)
@@ -272,12 +272,12 @@ index b5938f2..4e314dc 100644
 -              qp->send_cq          = qp_init_attr->send_cq;
 -              qp->recv_cq          = qp_init_attr->recv_cq;
 -              qp->srq              = qp_init_attr->srq;
-+              qp->context          = context;
++              qp->context          = context;
 +              qp->qp_context       = qp_init_attr->qp_context;
 +              qp->pd               = pd;
 +              qp->send_cq          = qp_init_attr->send_cq;
 +              qp->recv_cq          = qp_init_attr->recv_cq;
-+              qp->srq              = qp_init_attr->srq;
++              qp->srq              = qp_init_attr->srq;
                qp->qp_type          = qp_init_attr->qp_type;
                qp->state            = IBV_QPS_RESET;
                qp->events_completed = 0;