pop

diff --git a/meta b/meta
index 175e1cce6a9378151d6bbd33f21b16bbe185a26d..2b4288ec906227ba6db85ee32198680a8bb87542 100644 (file)
--- a/meta
+++ b/meta
@@ -1,11 +1,11 @@
 Version: 1
-Previous: 133fea81905a09962bd642f886391bd332788029
-Head: 5fb0d908fd199cbad61d107b890ef2a597a26c64
+Previous: 35d980cae413f05960af1bc86893196375a08a26
+Head: bc1d17a25e6ce1e956c29b4b1e7fd86e4880703e
 Applied:
   verbs-ext: b3d744f488bc97442df7e6cef8536d3b0352a786
   xrcd: 5fb0d908fd199cbad61d107b890ef2a597a26c64
+  srq_ex: bc1d17a25e6ce1e956c29b4b1e7fd86e4880703e
 Unapplied:
-  srq_ex: 2b683573a3b3c27afab01f09c73e7e4ae6b0bbc9
   xrc_qp: 4ad62e7ffdfe45e2f3ffcfc77cd1fe327c5c24fa
   open_qp: 5a153ad1d91a85e22f8736a391f049b9610c5dd3
   open_qp_man: 16944620e2b43e9ba26925d8e3d6cfe310a0108a

diff --git a/patches/srq_ex b/patches/srq_ex
index 62db956185c292b45556d55b7da154eba103600a..c3f5aa78c954875093c3d9e32eaccb01ae853a9a 100644 (file)
--- a/patches/srq_ex
+++ b/patches/srq_ex
@@ -1,5 +1,5 @@
-Bottom: d61609a08e9982129877f09abe125a8fb4ebe771
-Top:    bd68ab33c07c691122588fd24837345e7a5c43cc
+Bottom: 87b27489a0f1ae8e3a6eb34a11056bca16a2c292
+Top:    cb2972a6b5c7955c5979af7426814d3a115a5ed5
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-09-17 12:34:55 -0700
 
@@ -23,7 +23,7 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 ---
 
 diff --git a/include/infiniband/driver.h b/include/infiniband/driver.h
-index cdd917a..8a1535a 100644
+index 88d94c3..c670dc1 100644
 --- a/include/infiniband/driver.h
 +++ b/include/infiniband/driver.h
 @@ -64,6 +64,23 @@ struct verbs_xrcd {
@@ -123,18 +123,10 @@ index d7c673f..3d72fa7 100644
  
  struct ibv_destroy_cq_v1 {
 diff --git a/include/infiniband/verbs.h b/include/infiniband/verbs.h
-index 08750e7..946a127 100644
+index 4d68cd3..946a127 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" {
-@@ -414,6 +415,30 @@ struct ibv_srq_init_attr {
+@@ -415,6 +415,30 @@ struct ibv_srq_init_attr {
        struct ibv_srq_attr     attr;
  };
  
@@ -165,7 +157,7 @@ index 08750e7..946a127 100644
  enum ibv_qp_type {
        IBV_QPT_RC = 2,
        IBV_QPT_UC,
-@@ -736,6 +761,9 @@ struct verbs_context {
+@@ -737,6 +761,9 @@ struct verbs_context {
        int (*drv_new_func1) ();        new corresponding provider call of func1
        int (*lib_new_func1) ();        New library call func1
        */
@@ -175,7 +167,7 @@ index 08750e7..946a127 100644
        struct ibv_xrcd *       (*open_xrcd)(struct ibv_context *context,
                                             int fd, int oflags);
        int                     (*close_xrcd)(struct ibv_xrcd *xrcd);
-@@ -1021,6 +1049,18 @@ static inline int ibv_req_notify_cq(struct ibv_cq *cq, int solicited_only)
+@@ -1022,6 +1049,18 @@ 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);
  
@@ -194,7 +186,7 @@ index 08750e7..946a127 100644
  /**
   * ibv_modify_srq - Modifies the attributes for the specified SRQ.
   * @srq: The SRQ to modify.
-@@ -1045,6 +1085,16 @@ int ibv_modify_srq(struct ibv_srq *srq,
+@@ -1046,6 +1085,16 @@ int ibv_modify_srq(struct ibv_srq *srq,
   */
  int ibv_query_srq(struct ibv_srq *srq, struct ibv_srq_attr *srq_attr);
  
@@ -212,7 +204,7 @@ index 08750e7..946a127 100644
   * ibv_destroy_srq - Destroys the specified SRQ.
   * @srq: The SRQ to destroy.
 diff --git a/src/cmd.c b/src/cmd.c
-index e6caf5b..f58e30a 100644
+index f9beded..d46f1f2 100644
 --- a/src/cmd.c
 +++ b/src/cmd.c
 @@ -481,6 +481,75 @@ int ibv_cmd_create_srq(struct ibv_pd *pd,