pop

diff --git a/meta b/meta
index 627d51be0bb8e9e84b7dc3a1a3136579876200ac..7ea9a4b501ccc3a2982d2351f4252808c303eb95 100644 (file)
--- a/meta
+++ b/meta
@@ -1,11 +1,11 @@
 Version: 1
-Previous: eb1ed5bcd23d12f18f6f448a2fae17f446d90ce3
-Head: 8241c6e63780a40a3f8f6fbf2462a3b185638be3
+Previous: 84fbb44705a66290792b4e0f3e4a9adc3f0f5b6b
+Head: 4ff361c792f5a438e96f425248ce47a30cf27a94
 Applied:
   verbs-ext: a803d177d5947d6aa0ca474dc2401124e6aa1f00
   xrcd2: 8241c6e63780a40a3f8f6fbf2462a3b185638be3
+  srq_ex: 4ff361c792f5a438e96f425248ce47a30cf27a94
 Unapplied:
-  srq_ex: 3d6e3e35b5f89c7c33f02130cc4244bdbeb4f215
   xrc_qp: 56ed588de01a8eb2e9a912d5abdb2540ce05a947
   open_qp: 90e26c1e6a3a3c687c5404bd37ace069dd9227e5
   open_qp_man: 629a135a7d9a161fdc3fc5327acf60ab87adf611

diff --git a/patches/srq_ex b/patches/srq_ex
index c878f39eaffe5716e5bb5563354ca8c2fd2e4048..4cde25d64e97dca428e08fdbe0dfc667d7617fa0 100644 (file)
--- a/patches/srq_ex
+++ b/patches/srq_ex
@@ -1,5 +1,5 @@
-Bottom: 2db36b8f446df11adc6bd2c4e1c444949a6db8d6
-Top:    4e7641f2ece6ba8bc4b6b8b68c05f2e100d64982
+Bottom: b3e9223aaac5a7411bb3f4d9cb44d8df42847b45
+Top:    c1456e1369132726bfb59e2b6f3240f85581e59d
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-09-17 12:34:55 -0700
 
@@ -73,7 +73,7 @@ index ce88442..05ff730 100644
 +
  #endif /* INFINIBAND_DRIVER_H */
 diff --git a/include/infiniband/kern-abi.h b/include/infiniband/kern-abi.h
-index d7c673f..3d72fa7 100644
+index 6f40ad2..ef93cc3 100644
 --- a/include/infiniband/kern-abi.h
 +++ b/include/infiniband/kern-abi.h
 @@ -88,6 +88,7 @@ enum {
@@ -121,7 +121,7 @@ index d7c673f..3d72fa7 100644
 +      IB_USER_VERBS_CMD_CREATE_XSRQ_V2 = -1
  };
  
- struct ibv_destroy_cq_v1 {
+ struct ibv_modify_srq_v3 {
 diff --git a/include/infiniband/verbs.h b/include/infiniband/verbs.h
 index cf8299a..d7dfcd3 100644
 --- a/include/infiniband/verbs.h
@@ -220,10 +220,10 @@ index cf8299a..d7dfcd3 100644
   * ibv_destroy_srq - Destroys the specified SRQ.
   * @srq: The SRQ to destroy.
 diff --git a/src/cmd.c b/src/cmd.c
-index f0fb1dc..641ab28 100644
+index fe87723..e687a3d 100644
 --- a/src/cmd.c
 +++ b/src/cmd.c
-@@ -488,6 +488,75 @@ int ibv_cmd_create_srq(struct ibv_pd *pd,
+@@ -438,6 +438,75 @@ int ibv_cmd_create_srq(struct ibv_pd *pd,
        return 0;
  }