pop

diff --git a/meta b/meta
index ee6e4e386511d16f7074d4eab3f8c4804c55002a..d63cc1f9f41995d2be3bc5c381cf1831d72a2d3c 100644 (file)
--- a/meta
+++ b/meta
@@ -1,12 +1,12 @@
 Version: 1
-Previous: 951b820dda70cfaec6ce821ebe6b328a3bf7f413
-Head: 91529c3d3de6d93f03d70214ec3b57c42e45ee9f
+Previous: 05a844cc2c12e035810427fd10758ef391b81765
+Head: a7db461faf2c3c46b8ff733a78ca38036940a558
 Applied:
   verbs-ext: b3d744f488bc97442df7e6cef8536d3b0352a786
   xrcd: 5fb0d908fd199cbad61d107b890ef2a597a26c64
   srq_ex: 91529c3d3de6d93f03d70214ec3b57c42e45ee9f
+  xrc_qp: a7db461faf2c3c46b8ff733a78ca38036940a558
 Unapplied:
-  xrc_qp: 4ad62e7ffdfe45e2f3ffcfc77cd1fe327c5c24fa
   open_qp: 5a153ad1d91a85e22f8736a391f049b9610c5dd3
   open_qp_man: 16944620e2b43e9ba26925d8e3d6cfe310a0108a
   xrc_sample: 7c2b4dd047c9433d781d158a8e749b3c76d07459

diff --git a/patches/xrc_qp b/patches/xrc_qp
index 1e1b0284678fb8ad76ac23ddd61d902e344dd88a..a0222fbf2fac43a9f36f665db5158ab25717b90d 100644 (file)
--- a/patches/xrc_qp
+++ b/patches/xrc_qp
@@ -1,5 +1,5 @@
-Bottom: bd68ab33c07c691122588fd24837345e7a5c43cc
-Top:    ee35ff9eb019eeb28d8e132079af9b57733715cf
+Bottom: adadbb2be659503c8b5d511f70971b54a9ef67b3
+Top:    ee34e262e30ef01242f6fa16121a4b50e7b91108
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-09-17 16:00:12 -0700
 
@@ -32,7 +32,7 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 ---
 
 diff --git a/include/infiniband/driver.h b/include/infiniband/driver.h
-index 8a1535a..97557b5 100644
+index fc7c591..a29a1bc 100644
 --- a/include/infiniband/driver.h
 +++ b/include/infiniband/driver.h
 @@ -81,6 +81,16 @@ struct verbs_srq {
@@ -171,7 +171,7 @@ index 946a127..56c5db0 100644
   * ibv_modify_qp - Modify a queue pair.
   */
 diff --git a/src/cmd.c b/src/cmd.c
-index f58e30a..c8a1586 100644
+index 462c58e..596bb62 100644
 --- a/src/cmd.c
 +++ b/src/cmd.c
 @@ -659,6 +659,98 @@ int ibv_cmd_destroy_srq(struct ibv_srq *srq)