refresh

diff --git a/meta b/meta
index 1d97366c2dd1235629c8d3880af48efa5f44c726..e017a4e84d636372050ca6ab63b271ed2723fbfc 100644 (file)
--- a/meta
+++ b/meta
@@ -1,13 +1,12 @@
 Version: 1
-Previous: 8d9b0c3578ba8a1010a28d4190a37cfe86f26768
-Head: e995bfc49dbbec24524f92a6bba8effa956762a8
+Previous: 92fb82839c5c9a6d610e2b5231ea0dbff68df9ea
+Head: aaccbc1690e3cdb24ab4d4bff28733dd31c4efc4
 Applied:
   verbs-ext: 6fbf2b29ca68fc10b7ee47dc0c09f54db0b32320
   compat-ex: fb8aa3e0b8ed628564d7d774907fd17a72a23522
   xrcd: 71fa003681345f671bdef05c9548263252e949de
   srq_ex: 4533085cc46f8b356d9f1ade0e737acfe744471b
   xrc_qp: 72c00c4918a57f1a1fb058097d015f0d8fb60308
-  open_qp: cf021b6a9ce90b76b45ff2f1030a8d499ac1e533
-  refresh-temp: e995bfc49dbbec24524f92a6bba8effa956762a8
+  open_qp: aaccbc1690e3cdb24ab4d4bff28733dd31c4efc4
 Unapplied:
 Hidden:

diff --git a/patches/open_qp b/patches/open_qp
index 1348e0ccd49f24da29fabccffc91359b21fc1473..8f7192dd67814c6e9ac1796c356c547c5967c341 100644 (file)
--- a/patches/open_qp
+++ b/patches/open_qp
@@ -1,5 +1,5 @@
 Bottom: 2f0964be7f5ced89346f12c4ed6190a5af029461
-Top:    8108d1a32d2fb1da2879984d74deff21ebf9e2c3
+Top:    f673c8e8aeb5a5dad4970bfc72b8d4a94614e591
 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 68ea657..347b49e 100644
+index 68ea657..765ac8b 100644
 --- a/include/infiniband/verbs.h
 +++ b/include/infiniband/verbs.h
 @@ -504,6 +504,20 @@ struct ibv_qp_init_attr_ex {
@@ -115,7 +115,7 @@ index 68ea657..347b49e 100644
        int (*drv_new_func1) ();        new corresponding provider call of func1
        int (*lib_new_func1) ();        New library call func1
        */
-+      struct ibv_qp *         (*open_qp)(struct ibv_xrc *xrcd,
++      struct ibv_qp *         (*open_qp)(struct ibv_xrcd *xrcd,
 +                                         struct ibv_qp_open_attr *attr);
        struct ibv_qp *         (*create_qp_ex)(struct ibv_pd *pd,
                                                struct ibv_qp_init_attr_ex *qp_init_attr_ex);

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index c551fe9..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,22 +0,0 @@
-Bottom: 8108d1a32d2fb1da2879984d74deff21ebf9e2c3
-Top:    f673c8e8aeb5a5dad4970bfc72b8d4a94614e591
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2012-09-19 09:40:02 -0700
-
-Refresh of open_qp
-
----
-
-diff --git a/include/infiniband/verbs.h b/include/infiniband/verbs.h
-index 347b49e..765ac8b 100644
---- a/include/infiniband/verbs.h
-+++ b/include/infiniband/verbs.h
-@@ -863,7 +863,7 @@ struct verbs_context {
-       int (*drv_new_func1) ();        new corresponding provider call of func1
-       int (*lib_new_func1) ();        New library call func1
-       */
--      struct ibv_qp *         (*open_qp)(struct ibv_xrc *xrcd,
-+      struct ibv_qp *         (*open_qp)(struct ibv_xrcd *xrcd,
-                                          struct ibv_qp_open_attr *attr);
-       struct ibv_qp *         (*create_qp_ex)(struct ibv_pd *pd,
-                                               struct ibv_qp_init_attr_ex *qp_init_attr_ex);