refresh

diff --git a/meta b/meta
index 1fdf1c63b836c195754bcb2ce98504275be463a1..a50aabc9456077c751fdad8e6f07ad1b242476e0 100644 (file)
--- a/meta
+++ b/meta
@@ -1,8 +1,7 @@
 Version: 1
-Previous: 5424c105efe5274d2f02738ce0efd6cead779204
-Head: 18efbc968eda75e43eb593b5d1f3728e302ed4fa
+Previous: 0cbe96f013b8188e9be3b517cb2158bdc271b857
+Head: 1540687d721504ec1810aac7cc53ec7272415eb9
 Applied:
-  ibacm-check-for-nodelay-on-pat: 9b03bd1c878846b4937c5d71c1c2258949bec9db
-  refresh-temp: 18efbc968eda75e43eb593b5d1f3728e302ed4fa
+  ibacm-check-for-nodelay-on-pat: 1540687d721504ec1810aac7cc53ec7272415eb9
 Unapplied:
 Hidden:

diff --git a/patches/ibacm-check-for-nodelay-on-pat b/patches/ibacm-check-for-nodelay-on-pat
index dec03c2c0539fb364ba113f4f7810ce17a0b92df..e4fea6770b052791931a615e5ff435ce1e7fedf4 100644 (file)
--- a/patches/ibacm-check-for-nodelay-on-pat
+++ b/patches/ibacm-check-for-nodelay-on-pat
@@ -1,5 +1,5 @@
 Bottom: 1fcbb0d2b361b8a2ed7ce1d4252ecc8c4be8ae71
-Top:    1fcbb0d2b361b8a2ed7ce1d4252ecc8c4be8ae71
+Top:    b0ce50e45627832143a3023caf5b27d7a3ef22f8
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2010-12-10 14:23:30 -0800
 
@@ -13,4 +13,15 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 
 ---
 
-
+diff --git a/src/acme.c b/src/acme.c
+index a7b7413..dd645c1 100644
+--- a/src/acme.c
++++ b/src/acme.c
+@@ -493,7 +493,7 @@ static int resolve_lid(struct ibv_path_record *path)
+       path->dlid = htons((uint16_t) atoi(dest_addr));
+       path->reversible_numpath = IBV_PATH_RECORD_REVERSIBLE | 1;
+ 
+-      ret = ib_acm_resolve_path(path, 0);
++      ret = ib_acm_resolve_path(path, get_resolve_flags());
+       if (ret)
+               printf("ib_acm_resolve_path failed: %s\n", strerror(errno));

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 0f106c0..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,21 +0,0 @@
-Bottom: 1fcbb0d2b361b8a2ed7ce1d4252ecc8c4be8ae71
-Top:    b0ce50e45627832143a3023caf5b27d7a3ef22f8
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2010-12-10 14:57:52 -0800
-
-Refresh of ibacm-check-for-nodelay-on-pat
-
----
-
-diff --git a/src/acme.c b/src/acme.c
-index a7b7413..dd645c1 100644
---- a/src/acme.c
-+++ b/src/acme.c
-@@ -493,7 +493,7 @@ static int resolve_lid(struct ibv_path_record *path)
-       path->dlid = htons((uint16_t) atoi(dest_addr));
-       path->reversible_numpath = IBV_PATH_RECORD_REVERSIBLE | 1;
- 
--      ret = ib_acm_resolve_path(path, 0);
-+      ret = ib_acm_resolve_path(path, get_resolve_flags());
-       if (ret)
-               printf("ib_acm_resolve_path failed: %s\n", strerror(errno));