pop

diff --git a/meta b/meta
index 6662435ef69b4418b1ac1b9a73f298b7854e2203..cbb24c478ea4269c895351e747130debbe2ef668 100644 (file)
--- a/meta
+++ b/meta
@@ -1,13 +1,13 @@
 Version: 1
-Previous: dce9ecf3ed9bc3bdc155a2fe2b79d795c0894e7f
-Head: 41c4a902e322da2cc08caabd0ba56a1ffff4c43e
+Previous: fb128cf65abe6b8ca6b0da85423c97acc4407dbb
+Head: 02ed1a5b57528c104aefa6608f45bdf2d718ded3
 Applied:
   verbs-ext: 6f5bd9320736c14a35405d30b5bcda552c0a9bc3
   xrcd: b4857ddf1a0837fff54f81be34a1464e9239de0e
   srq_ex: 404e74c3eec99818cf38bff5f2534dc48ad56627
   xrc_qp: 41c4a902e322da2cc08caabd0ba56a1ffff4c43e
+  open_qp: 02ed1a5b57528c104aefa6608f45bdf2d718ded3
 Unapplied:
-  open_qp: 6879b6122f8020f5defafa829507258bde55d00d
   open_qp_man: fceeb733e907e3f0a5ccd10277e9b8807c4c9bb8
   xrc_sample: 0dda1a80ee73830faa73b0649b678d119fabc7ca
 Hidden:

diff --git a/patches/open_qp b/patches/open_qp
index 320d12087cbfb4040ca9726428f1a22125759478..e508e389a13cd18c0af18259e7fe62bdd06aee8f 100644 (file)
--- a/patches/open_qp
+++ b/patches/open_qp
@@ -1,5 +1,5 @@
-Bottom: 5ba60d5ff9a8dc9ea920faee7e863fd20a5faa13
-Top:    cea9872f0633cba6ce97d3ef393629d98a8e298e
+Bottom: 541345b5c2f2f2889e951657655ccf34257ae86c
+Top:    724ff279269382185656ceca52a7f4cf79bd1f28
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-09-19 09:19:59 -0700
 
@@ -77,7 +77,7 @@ index b6d5ce9..e24fa4f 100644
  
  struct ibv_destroy_cq_v1 {
 diff --git a/include/infiniband/verbs.h b/include/infiniband/verbs.h
-index a8dd0a5..34450a2 100644
+index e7e4d3e..83359ee 100644
 --- a/include/infiniband/verbs.h
 +++ b/include/infiniband/verbs.h
 @@ -486,6 +486,22 @@ struct ibv_qp_init_attr_ex {
@@ -122,7 +122,7 @@ index a8dd0a5..34450a2 100644
        struct ibv_qp *         (*create_qp_ex)(struct ibv_context *context,
                                                struct ibv_qp_init_attr_ex *qp_init_attr_ex);
        uint32_t                (*get_srq_num)(struct ibv_srq *srq);
-@@ -1162,6 +1181,20 @@ ibv_create_qp_ex(struct ibv_context *context, struct ibv_qp_init_attr_ex *qp_ini
+@@ -1177,6 +1196,20 @@ ibv_create_qp_ex(struct ibv_context *context, struct ibv_qp_init_attr_ex *qp_ini
  }
  
  /**