From 9101a0d619cb0e528151223ac6eb8aa8176566c1 Mon Sep 17 00:00:00 2001
From: Sean Hefty <sean.hefty@intel.com>
Date: Wed, 12 Sep 2012 11:04:48 -0700
Subject: [PATCH] refresh

---
 meta                 |  7 +++----
 patches/refresh-temp | 21 ---------------------
 patches/xrcd         |  7 +++----
 3 files changed, 6 insertions(+), 29 deletions(-)
 delete mode 100644 patches/refresh-temp

diff --git a/meta b/meta
index e7bc957..ccecc91 100644
--- a/meta
+++ b/meta
@@ -1,9 +1,8 @@
 Version: 1
-Previous: 8af3c42268cc2a08d74464d7e8f371d422487d30
-Head: 4dfb0bdc2d32f5afa57ecc4981d591a387253830
+Previous: cb1317c701abb4ea0b1e90cb5ee83d761ee72cbe
+Head: a315cce4aec1ab8e31854ccc021088ed8ce771fb
 Applied:
   verbs-ext: 6fbf2b29ca68fc10b7ee47dc0c09f54db0b32320
-  xrcd: 1c1dbb0a6997e9b1e117703b4e92282b9df1f323
-  refresh-temp: 4dfb0bdc2d32f5afa57ecc4981d591a387253830
+  xrcd: a315cce4aec1ab8e31854ccc021088ed8ce771fb
 Unapplied:
 Hidden:
diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644
index 0e993cd..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,21 +0,0 @@
-Bottom: f044724ac0e8737260d5f81283a21bf1fa522102
-Top:    8a88265fe1dfe8a615be3289a83379f981658c89
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2012-09-12 11:04:47 -0700
-
-Refresh of xrcd
-
----
-
-diff --git a/src/verbs.c b/src/verbs.c
-index 5bde012..4e314dc 100644
---- a/src/verbs.c
-+++ b/src/verbs.c
-@@ -433,7 +433,6 @@ struct ibv_qp *__ibv_create_qp(struct ibv_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->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 26ed8a1..bb47904 100644
--- a/patches/xrcd
+++ b/patches/xrcd
@@ -1,5 +1,5 @@
 Bottom: b2b2b839d978bb240b0641dff8459eaee9553d17
-Top:    f044724ac0e8737260d5f81283a21bf1fa522102
+Top:    8a88265fe1dfe8a615be3289a83379f981658c89
 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..5bde012 100644
+index b5938f2..4e314dc 100644
 --- a/src/verbs.c
 +++ b/src/verbs.c
 @@ -154,6 +154,32 @@ int __ibv_dealloc_pd(struct ibv_pd *pd)
@@ -262,7 +262,7 @@ index b5938f2..5bde012 100644
  struct ibv_mr *__ibv_reg_mr(struct ibv_pd *pd, void *addr,
  			    size_t length, int access)
  {
-@@ -401,12 +427,13 @@ struct ibv_qp *__ibv_create_qp(struct ibv_pd *pd,
+@@ -401,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) {
@@ -278,7 +278,6 @@ index b5938f2..5bde012 100644
 +		qp->send_cq	     = qp_init_attr->send_cq;
 +		qp->recv_cq	     = qp_init_attr->recv_cq;
 +		qp->srq              = qp_init_attr->srq;
-+
  		qp->qp_type          = qp_init_attr->qp_type;
  		qp->state	     = IBV_QPS_RESET;
  		qp->events_completed = 0;
-- 
2.46.0