pop

diff --git a/meta b/meta
index 7303f3d3448b1c629dd7524e12ba164cd9202a82..c56e927fbd1c5c85d8880dd9646f7a89837fe791 100644 (file)
--- a/meta
+++ b/meta
@@ -1,11 +1,11 @@
 Version: 1
-Previous: e0258b8699c0e8c8dd3fc12104c935961756ebd7
-Head: f22b88dd94854fd3b42fb6a48e7a6962620ddc81
+Previous: b52ec1d6e56e6625d5747682da88e2b489d51bde
+Head: cd9b15c05e658240baa71d454ae26a7bf180b496
 Applied:
   verbs-ext: 6fbf2b29ca68fc10b7ee47dc0c09f54db0b32320
   compat-ex: fb8aa3e0b8ed628564d7d774907fd17a72a23522
   xrcd: 71fa003681345f671bdef05c9548263252e949de
   srq_ex: f22b88dd94854fd3b42fb6a48e7a6962620ddc81
+  xrc_qp: cd9b15c05e658240baa71d454ae26a7bf180b496
 Unapplied:
-  xrc_qp: 71de751ac24904a7170258c7ce63c739d28c7a05
 Hidden:

diff --git a/patches/xrc_qp b/patches/xrc_qp
index d0f465471e97ae56fbbbb65a09dc4160d7f71fd3..05b7a36abfc178ce335c59fa2dbae11266d9e5f2 100644 (file)
--- a/patches/xrc_qp
+++ b/patches/xrc_qp
@@ -1,5 +1,5 @@
-Bottom: 115158d16c82c271835675f3638359c45d2b1ab8
-Top:    e7dc06c6bd70e08034618b89c2ed6a0f89a5c51d
+Bottom: 11941897032eb87737493328f3f37b7c3a43ee9c
+Top:    a4fab3fcda770552f8fe9845cfe7c881b4fa36e1
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-09-17 16:00:12 -0700
 
@@ -254,10 +254,10 @@ index 92bfabd..9ee1cf2 100644
                
  } IBVERBS_1.0;
 diff --git a/src/verbs.c b/src/verbs.c
-index d08ee79..d9cd8d7 100644
+index 0964ccc..03bd91a 100644
 --- a/src/verbs.c
 +++ b/src/verbs.c
-@@ -462,19 +462,44 @@ int __ibv_destroy_srq(struct ibv_srq *srq)
+@@ -457,19 +457,44 @@ int __ibv_destroy_srq(struct ibv_srq *srq)
  }
  default_symver(__ibv_destroy_srq, ibv_destroy_srq);
  
@@ -311,7 +311,7 @@ index d08ee79..d9cd8d7 100644
                qp->state            = IBV_QPS_RESET;
                qp->events_completed = 0;
                pthread_mutex_init(&qp->mutex, NULL);
-@@ -483,6 +508,17 @@ struct ibv_qp *__ibv_create_qp(struct ibv_pd *pd,
+@@ -478,6 +503,17 @@ struct ibv_qp *__ibv_create_qp(struct ibv_pd *pd,
  
        return qp;
  }