refresh

diff --git a/meta b/meta
index d2b74138dd9b367f1ac6f629b888078f93a1ce01..4abba9427429e01edbbc7723ffd92587992a3783 100644 (file)
--- a/meta
+++ b/meta
@@ -1,11 +1,10 @@
 Version: 1
-Previous: 84ed278dffc501aaa43b04af6ddd67f2b82f621f
-Head: e0bfa8ffb93e38b7483b4155e8441b5d1f79834d
+Previous: 40b6148c907a97930527e3d8b94ccb64e74e227d
+Head: 4a296a08851356d367668a71cb852480dc7f909b
 Applied:
   verbs-ext: b3d744f488bc97442df7e6cef8536d3b0352a786
   xrcd: 07cc711dd4091666de3c99545c64578ce6472da7
-  srq_ex: fd67d92d191e2a549d563317150999b4f0ab3bc1
-  refresh-temp: e0bfa8ffb93e38b7483b4155e8441b5d1f79834d
+  srq_ex: 4a296a08851356d367668a71cb852480dc7f909b
 Unapplied:
   compat-ex: 7cb34472bd00bc286569b726c7d38c6dd0dfe3b0
   xrc_qp: 6c98944a89c8f725d08f68a938954e10c7f09450

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 1a8f076..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,21 +0,0 @@
-Bottom: e1563f3afb59f9034fe7d7236e3d85eedfbfb15f
-Top:    eb069dacc3502ba7f9e575f462e80f48ec5b8fd4
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2012-09-26 11:34:35 -0700
-
-Refresh of srq_ex
-
----
-
-diff --git a/include/infiniband/verbs.h b/include/infiniband/verbs.h
-index f339561..e67bf21 100644
---- a/include/infiniband/verbs.h
-+++ b/include/infiniband/verbs.h
-@@ -39,6 +39,7 @@
- #include <stdint.h>
- #include <pthread.h>
- #include <stddef.h>
-+#include <errno.h>
- 
- #ifdef __cplusplus
- #  define BEGIN_C_DECLS extern "C" {

diff --git a/patches/srq_ex b/patches/srq_ex
index af2cf299748823ad5d34e28c2a802d1a236ce8b9..9723a3f203694e4eb4121f21d976d4091fdb620a 100644 (file)
--- a/patches/srq_ex
+++ b/patches/srq_ex
@@ -1,5 +1,5 @@
 Bottom: d61609a08e9982129877f09abe125a8fb4ebe771
-Top:    e1563f3afb59f9034fe7d7236e3d85eedfbfb15f
+Top:    eb069dacc3502ba7f9e575f462e80f48ec5b8fd4
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-09-17 12:34:55 -0700
 
@@ -123,10 +123,18 @@ index d7c673f..3d72fa7 100644
  
  struct ibv_destroy_cq_v1 {
 diff --git a/include/infiniband/verbs.h b/include/infiniband/verbs.h
-index 08750e7..f339561 100644
+index 08750e7..e67bf21 100644
 --- a/include/infiniband/verbs.h
 +++ b/include/infiniband/verbs.h
-@@ -414,6 +414,28 @@ struct ibv_srq_init_attr {
+@@ -39,6 +39,7 @@
+ #include <stdint.h>
+ #include <pthread.h>
+ #include <stddef.h>
++#include <errno.h>
+ 
+ #ifdef __cplusplus
+ #  define BEGIN_C_DECLS extern "C" {
+@@ -414,6 +415,28 @@ struct ibv_srq_init_attr {
        struct ibv_srq_attr     attr;
  };
  
@@ -155,7 +163,7 @@ index 08750e7..f339561 100644
  enum ibv_qp_type {
        IBV_QPT_RC = 2,
        IBV_QPT_UC,
-@@ -736,6 +758,9 @@ struct verbs_context {
+@@ -736,6 +759,9 @@ struct verbs_context {
        int (*drv_new_func1) ();        new corresponding provider call of func1
        int (*lib_new_func1) ();        New library call func1
        */
@@ -165,7 +173,7 @@ index 08750e7..f339561 100644
        struct ibv_xrcd *       (*open_xrcd)(struct ibv_context *context,
                                             int fd, int oflags);
        int                     (*close_xrcd)(struct ibv_xrcd *xrcd);
-@@ -1021,6 +1046,17 @@ static inline int ibv_req_notify_cq(struct ibv_cq *cq, int solicited_only)
+@@ -1021,6 +1047,17 @@ static inline int ibv_req_notify_cq(struct ibv_cq *cq, int solicited_only)
  struct ibv_srq *ibv_create_srq(struct ibv_pd *pd,
                               struct ibv_srq_init_attr *srq_init_attr);
  
@@ -183,7 +191,7 @@ index 08750e7..f339561 100644
  /**
   * ibv_modify_srq - Modifies the attributes for the specified SRQ.
   * @srq: The SRQ to modify.
-@@ -1045,6 +1081,16 @@ int ibv_modify_srq(struct ibv_srq *srq,
+@@ -1045,6 +1082,16 @@ int ibv_modify_srq(struct ibv_srq *srq,
   */
  int ibv_query_srq(struct ibv_srq *srq, struct ibv_srq_attr *srq_attr);