refresh

diff --git a/meta b/meta
index 06be8eb0da9d5ff029bba9d18869a9f2b2f9f875..2e7c6d206b450da7343cb7f109d47dbf45b6a1a7 100644 (file)
--- a/meta
+++ b/meta
@@ -1,9 +1,8 @@
 Version: 1
-Previous: b9da9a021c40ff82cb82abfdf36946a89d32d24a
-Head: 4f20656f2e46c0fc6ad66f6ea1c77f7054b2bc89
+Previous: ca4109500b7b47c08a7a1f1f333cb598fa25292c
+Head: 8a0c0b32f75f1b439b5665e6047713ff6ef37ef9
 Applied:
-  acm: 607c5d246ac8bf9ab9276f45a946b765dd2648cb
-  refresh-temp: 4f20656f2e46c0fc6ad66f6ea1c77f7054b2bc89
+  acm: 8a0c0b32f75f1b439b5665e6047713ff6ef37ef9
 Unapplied:
   af_ib: 99a9838e9b2ed605005882655df73a213130c530
   dbg-out: 4b4c0572eab77856d8fbb919b1feb8f3502a101a

diff --git a/patches/acm b/patches/acm
index d7b83a219eb4b6a8046d9e01983a96d28d366e4a..74cd9d5915ad0476503ae2607b51f1979b23aa20 100644 (file)
--- a/patches/acm
+++ b/patches/acm
@@ -1,5 +1,5 @@
 Bottom: 15d584ee23e38f450359c3caea511818f5bf14c0
-Top:    15d584ee23e38f450359c3caea511818f5bf14c0
+Top:    f1083d042db3658ee98dca601a0a2fd94d4cb12a
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-08-17 16:41:04 -0700
 
@@ -16,4 +16,14 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 
 ---
 
-
+diff --git a/src/acm.c b/src/acm.c
+index 5bdeb88..458e23d 100755
+--- a/src/acm.c
++++ b/src/acm.c
+@@ -326,6 +326,7 @@ void ucma_ib_resolve(struct rdma_addrinfo **rai, struct rdma_addrinfo *hints)
+       struct acm_ep_addr_data *data;
+       int ret;
+ 
++      ucma_ib_init();
+       if (sock < 0)
+               return;

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 148abff..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,20 +0,0 @@
-Bottom: 15d584ee23e38f450359c3caea511818f5bf14c0
-Top:    f1083d042db3658ee98dca601a0a2fd94d4cb12a
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2012-08-17 16:42:19 -0700
-
-Refresh of acm
-
----
-
-diff --git a/src/acm.c b/src/acm.c
-index 5bdeb88..458e23d 100755
---- a/src/acm.c
-+++ b/src/acm.c
-@@ -326,6 +326,7 @@ void ucma_ib_resolve(struct rdma_addrinfo **rai, struct rdma_addrinfo *hints)
-       struct acm_ep_addr_data *data;
-       int ret;
- 
-+      ucma_ib_init();
-       if (sock < 0)
-               return;