pop

diff --git a/meta b/meta
index 7ea9a4b501ccc3a2982d2351f4252808c303eb95..59b7429928d50dfa48c839397f6122d324eea827 100644 (file)
--- a/meta
+++ b/meta
@@ -1,12 +1,12 @@
 Version: 1
-Previous: 84fbb44705a66290792b4e0f3e4a9adc3f0f5b6b
-Head: 4ff361c792f5a438e96f425248ce47a30cf27a94
+Previous: 5b95fe0d117acb79ce5f78ccd0aeab850f35af2e
+Head: c998814496ad0dd6e5e7bc31dcae0ce794b047b1
 Applied:
   verbs-ext: a803d177d5947d6aa0ca474dc2401124e6aa1f00
   xrcd2: 8241c6e63780a40a3f8f6fbf2462a3b185638be3
   srq_ex: 4ff361c792f5a438e96f425248ce47a30cf27a94
+  xrc_qp: c998814496ad0dd6e5e7bc31dcae0ce794b047b1
 Unapplied:
-  xrc_qp: 56ed588de01a8eb2e9a912d5abdb2540ce05a947
   open_qp: 90e26c1e6a3a3c687c5404bd37ace069dd9227e5
   open_qp_man: 629a135a7d9a161fdc3fc5327acf60ab87adf611
   xrc_sample: a9e895793297dfe0e9da28739a68cc5e3391f4bd

diff --git a/patches/xrc_qp b/patches/xrc_qp
index e2bec9e296cd9463aa51d979a3d5740c2387019a..7b0e37ff9b64406e713cea1959b912370e426f0b 100644 (file)
--- a/patches/xrc_qp
+++ b/patches/xrc_qp
@@ -1,5 +1,5 @@
-Bottom: 4e7641f2ece6ba8bc4b6b8b68c05f2e100d64982
-Top:    9357fd948fa031daf80ab93c90735c2e5dc059df
+Bottom: c1456e1369132726bfb59e2b6f3240f85581e59d
+Top:    b605962a7283591734f0a72f61ecf2a016fca504
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-09-17 16:00:12 -0700
 
@@ -64,7 +64,7 @@ index 05ff730..d43ae07 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 3d72fa7..b6d5ce9 100644
+index ef93cc3..bad0289 100644
 --- a/include/infiniband/kern-abi.h
 +++ b/include/infiniband/kern-abi.h
 @@ -617,6 +617,11 @@ struct ibv_kern_send_wr {
@@ -184,10 +184,10 @@ index d7dfcd3..f321866 100644
   * ibv_modify_qp - Modify a queue pair.
   */
 diff --git a/src/cmd.c b/src/cmd.c
-index 641ab28..87ac062 100644
+index e687a3d..2786bed 100644
 --- a/src/cmd.c
 +++ b/src/cmd.c
-@@ -666,6 +666,98 @@ int ibv_cmd_destroy_srq(struct ibv_srq *srq)
+@@ -600,6 +600,98 @@ int ibv_cmd_destroy_srq(struct ibv_srq *srq)
        return 0;
  }
  
@@ -286,7 +286,7 @@ index 641ab28..87ac062 100644
  int ibv_cmd_create_qp(struct ibv_pd *pd,
                      struct ibv_qp *qp, struct ibv_qp_init_attr *attr,
                      struct ibv_create_qp *cmd, size_t cmd_size,
-@@ -674,7 +766,7 @@ int ibv_cmd_create_qp(struct ibv_pd *pd,
+@@ -608,7 +700,7 @@ int ibv_cmd_create_qp(struct ibv_pd *pd,
        IBV_INIT_CMD_RESP(cmd, cmd_size, CREATE_QP, resp, resp_size);
  
        cmd->user_handle     = (uintptr_t) qp;