pop

diff --git a/meta b/meta
index 59b7429928d50dfa48c839397f6122d324eea827..1c8a7b6deb31f987cb4e62923c5523ef3eeb3aac 100644 (file)
--- a/meta
+++ b/meta
@@ -1,13 +1,13 @@
 Version: 1
-Previous: 5b95fe0d117acb79ce5f78ccd0aeab850f35af2e
-Head: c998814496ad0dd6e5e7bc31dcae0ce794b047b1
+Previous: 898cefb8e519121bc210fe8c7be71297910d81b4
+Head: cded350864906403d42ae92fdd6ab06c11b65038
 Applied:
   verbs-ext: a803d177d5947d6aa0ca474dc2401124e6aa1f00
   xrcd2: 8241c6e63780a40a3f8f6fbf2462a3b185638be3
   srq_ex: 4ff361c792f5a438e96f425248ce47a30cf27a94
   xrc_qp: c998814496ad0dd6e5e7bc31dcae0ce794b047b1
+  open_qp: cded350864906403d42ae92fdd6ab06c11b65038
 Unapplied:
-  open_qp: 90e26c1e6a3a3c687c5404bd37ace069dd9227e5
   open_qp_man: 629a135a7d9a161fdc3fc5327acf60ab87adf611
   xrc_sample: a9e895793297dfe0e9da28739a68cc5e3391f4bd
 Hidden:

diff --git a/patches/open_qp b/patches/open_qp
index 9e3cb8dc86e3bbde30e9ce33b97f7b67af3a4f8b..05a91cb70b25020be5a4a1a6e4212d3f7f5fc016 100644 (file)
--- a/patches/open_qp
+++ b/patches/open_qp
@@ -1,5 +1,5 @@
-Bottom: 9357fd948fa031daf80ab93c90735c2e5dc059df
-Top:    bc10a5552903d53e7301c370f1e89b08399af4b1
+Bottom: b605962a7283591734f0a72f61ecf2a016fca504
+Top:    5d2942aff10fc9e343dfa425de543f3fef7f1431
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-09-19 09:19:59 -0700
 
@@ -32,7 +32,7 @@ index d43ae07..a63d1e9 100644
                     int attr_mask,
                     struct ibv_qp_init_attr *qp_init_attr,
 diff --git a/include/infiniband/kern-abi.h b/include/infiniband/kern-abi.h
-index b6d5ce9..e24fa4f 100644
+index bad0289..d7d7081 100644
 --- a/include/infiniband/kern-abi.h
 +++ b/include/infiniband/kern-abi.h
 @@ -88,7 +88,8 @@ enum {
@@ -75,7 +75,7 @@ index b6d5ce9..e24fa4f 100644
 +      IB_USER_VERBS_CMD_OPEN_QP_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 f321866..a662ab4 100644
 --- a/include/infiniband/verbs.h
@@ -144,10 +144,10 @@ index f321866..a662ab4 100644
   */
  int ibv_modify_qp(struct ibv_qp *qp, struct ibv_qp_attr *attr,
 diff --git a/src/cmd.c b/src/cmd.c
-index 87ac062..da0d733 100644
+index 2786bed..f415d17 100644
 --- a/src/cmd.c
 +++ b/src/cmd.c
-@@ -816,6 +816,51 @@ int ibv_cmd_create_qp(struct ibv_pd *pd,
+@@ -750,6 +750,51 @@ int ibv_cmd_create_qp(struct ibv_pd *pd,
        return 0;
  }