pop

diff --git a/meta b/meta
index 69f7495787b217cab8d71898cce60152a690a653..3e0d8e0fcfc67c613151d471f63812073ad4f696 100644 (file)
--- a/meta
+++ b/meta
@@ -1,12 +1,12 @@
 Version: 1
-Previous: 62659e58495b15566f716a0ca46b9d87b0932ff4
-Head: 714af39b2bc2cc54dd2391a0df2c7e54856bc9c7
+Previous: 7ac680fef3f2b06a061d9420253ccb4246e2c936
+Head: 8a92d0c3c8ce5f513dff974912143f6b0283f8e3
 Applied:
   ucmatose: 714af39b2bc2cc54dd2391a0df2c7e54856bc9c7
+  ucmatose-accept: 8a92d0c3c8ce5f513dff974912143f6b0283f8e3
 Unapplied:
   af-ib-conn: 79a9408f96fbb36a7ef479e8f1568bfd70e1f32d
   addrtype: ff42af176a48b5f5970d9304a40ce6d3295d36ba
-  ucmatose-accept: a38e0b1914f38d52b1c2780a5c4183df0e3fa460
   dbg-fork: 5679a32af8305db3c0406f9abb961259304a384a
   dbg-out: 4b4c0572eab77856d8fbb919b1feb8f3502a101a
   dbg: 0c269855776d3001e37da8c8afe283c20e1d6cd6

diff --git a/patches/ucmatose-accept b/patches/ucmatose-accept
index fc303f5d91bd482d8f30314a1c50cfe5d975b860..1b0d5f7ffa068bfdb48e9c4e5aa35dabedb7042d 100644 (file)
--- a/patches/ucmatose-accept
+++ b/patches/ucmatose-accept
@@ -1,5 +1,5 @@
-Bottom: 456ce6603b09524564a80e7740e40381e5b2f6a8
-Top:    6443f4654d85f13671d58f9637d8bd4822c954b5
+Bottom: f7d2ba0428817eeaa855ddb332d7f7e51db9326f
+Top:    7a63e115cc4adf073292cd3edca568d9910e1a6e
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-10-04 12:01:50 -0700
 
@@ -15,10 +15,10 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 ---
 
 diff --git a/examples/cmatose.c b/examples/cmatose.c
-index 046d452..ab3e746 100644
+index 9ea6777..2b6b2b1 100644
 --- a/examples/cmatose.c
 +++ b/examples/cmatose.c
-@@ -267,7 +267,6 @@ err:
+@@ -266,7 +266,6 @@ err:
  static int connect_handler(struct rdma_cm_id *cma_id)
  {
        struct cmatest_node *node;
@@ -26,7 +26,7 @@ index 046d452..ab3e746 100644
        int ret;
  
        if (test.conn_index == connections) {
-@@ -287,10 +286,7 @@ static int connect_handler(struct rdma_cm_id *cma_id)
+@@ -286,10 +285,7 @@ static int connect_handler(struct rdma_cm_id *cma_id)
        if (ret)
                goto err2;