refresh

diff --git a/meta b/meta
index a1a3c03e6a3641886f5dfdaca13370df6a08e60c..d81817db199ea5237fe015c43c937d0be4d675c3 100644 (file)
--- a/meta
+++ b/meta
@@ -1,9 +1,8 @@
 Version: 1
-Previous: 4f559effbc4668dff7ccf62b2b511ab980f2b7fa
-Head: e1080c3f9f4027269156e09f96e735331368f64d
+Previous: 7f0e6b9e0f1bef81f6e6246bd97df681ffe14ab7
+Head: 9674d9dfe92f67a6cc51588fa41ef892662d27ab
 Applied:
-  test: 758a65cd31082ca0870def766dd5aea74cee8cf0
-  refresh-temp: e1080c3f9f4027269156e09f96e735331368f64d
+  test: 9674d9dfe92f67a6cc51588fa41ef892662d27ab
 Unapplied:
   afib: ea79ee5d40967c071a420e282c15a198a434de51
   seterr: 47eb0c419687c2690292c1910acae83a46e5388c

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 9550cef..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,20 +0,0 @@
-Bottom: bd3dc75f7f730ca898630a615ebb0359ffcf66e4
-Top:    fdd78452d7e02d706c88b4821b9ff48bc33218cb
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2013-05-03 15:03:15 -0700
-
-Refresh of test
-
----
-
-diff --git a/src/cma.c b/src/cma.c
-index 923e611..2fb9913 100755
---- a/src/cma.c
-+++ b/src/cma.c
-@@ -584,7 +584,6 @@ static int ucma_query_addr(struct rdma_cm_id *id)
-               if (ret)
-                       return ret;
-               id->port_num = resp.port_num;
--printf("port num %d\n", id->port_num);
-               id->route.addr.addr.ibaddr.pkey = resp.pkey;
-       }

diff --git a/patches/test b/patches/test
index 838426b88270f1ec50891b0e50b929b6ba800688..05bf67b97dd45211f7418ed00861ce8652ba9c8f 100644 (file)
--- a/patches/test
+++ b/patches/test
@@ -1,5 +1,5 @@
 Bottom: fdd78452d7e02d706c88b4821b9ff48bc33218cb
-Top:    bd3dc75f7f730ca898630a615ebb0359ffcf66e4
+Top:    fdd78452d7e02d706c88b4821b9ff48bc33218cb
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2013-05-03 14:59:29 -0700
 
@@ -8,14 +8,4 @@ test
 
 ---
 
-diff --git a/src/cma.c b/src/cma.c
-index 2fb9913..923e611 100755
---- a/src/cma.c
-+++ b/src/cma.c
-@@ -584,6 +584,7 @@ static int ucma_query_addr(struct rdma_cm_id *id)
-               if (ret)
-                       return ret;
-               id->port_num = resp.port_num;
-+printf("port num %d\n", id->port_num);
-               id->route.addr.addr.ibaddr.pkey = resp.pkey;
-       }
+