refresh

diff --git a/meta b/meta
index cb87194cc319e7b542aa2a5e6e385bb65e584c4e..b374a4af42f5adf1b6899f1e5f5510cc93e1588b 100644 (file)
--- a/meta
+++ b/meta
@@ -1,11 +1,10 @@
 Version: 1
-Previous: 58b93696438cddef64258b25f228465663b6b7ee
-Head: c3bc68245994f653a5b8aca665a3e65ad1c6a3df
+Previous: 88ead6a6786d2e25ab3135ec3c65ed6cb0ed102a
+Head: 07e4480ebb4d54a02271b6935bf60ea1f45aab86
 Applied:
   mc-refcnt: c7d28b35d64333c262de3ec972c426423dadccf9
   af_ib: c366c39d4afc939932efc2f5158ae332161369bf
-  typo: 7105cae4c144de4c9f6675df2f25df2017643e8f
-  refresh-temp: c3bc68245994f653a5b8aca665a3e65ad1c6a3df
+  typo: 07e4480ebb4d54a02271b6935bf60ea1f45aab86
 Unapplied:
   daemonize: eb42a0ac783273545fc8a0c93afd7d948aa76d72
   rel-1.0.6: 01c9f3298c9da13ed42a1506e1546abb5c4fcec0

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index bbf6d5b..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,22 +0,0 @@
-Bottom: 401468071c1fab953d36f230eeeb71f1a45376c5
-Top:    c5ac2adf6c4b04e769a48314b577a32c646f44d6
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2012-04-05 16:21:15 -0700
-
-Refresh of typo
-
----
-
-diff --git a/src/acme.c b/src/acme.c
-index 3d7461b..768f17e 100644
---- a/src/acme.c
-+++ b/src/acme.c
-@@ -419,7 +419,7 @@ static void show_path(struct ibv_path_record *path)
-       printf("  flow label: 0x%x\n", fl_hop >> 8);
-       printf("  hop limit: %d\n", (uint8_t) fl_hop);
-       printf("  tclass: %d\n", path->tclass);
--      printf("  reverisible: %d\n", path->reversible_numpath >> 7);
-+      printf("  reversible: %d\n", path->reversible_numpath >> 7);
-       printf("  pkey: 0x%x\n", ntohs(path->pkey));
-       printf("  sl: %d\n", ntohs(path->qosclass_sl) & 0xF);
-       printf("  mtu: %d\n", path->mtu & 0x1F);

diff --git a/patches/typo b/patches/typo
index eeda1d640140b79cf0b7d37dda8d7b082ee29361..f873997fcb1805a87e6cd738fdfdb572686e6956 100644 (file)
--- a/patches/typo
+++ b/patches/typo
@@ -1,5 +1,5 @@
 Bottom: 401468071c1fab953d36f230eeeb71f1a45376c5
-Top:    401468071c1fab953d36f230eeeb71f1a45376c5
+Top:    c5ac2adf6c4b04e769a48314b577a32c646f44d6
 Author: Hal Rosenstock <hal@mellanox.com>
 Date:   2012-04-05 16:20:44 -0700
 
@@ -11,4 +11,16 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 
 ---
 
-
+diff --git a/src/acme.c b/src/acme.c
+index 3d7461b..768f17e 100644
+--- a/src/acme.c
++++ b/src/acme.c
+@@ -419,7 +419,7 @@ static void show_path(struct ibv_path_record *path)
+       printf("  flow label: 0x%x\n", fl_hop >> 8);
+       printf("  hop limit: %d\n", (uint8_t) fl_hop);
+       printf("  tclass: %d\n", path->tclass);
+-      printf("  reverisible: %d\n", path->reversible_numpath >> 7);
++      printf("  reversible: %d\n", path->reversible_numpath >> 7);
+       printf("  pkey: 0x%x\n", ntohs(path->pkey));
+       printf("  sl: %d\n", ntohs(path->qosclass_sl) & 0xF);
+       printf("  mtu: %d\n", path->mtu & 0x1F);