refresh

diff --git a/meta b/meta
index 5dd7a2707ce6c093a15562e29701f89297575ccd..e13edf58364081f2d5fadedbeabd3223c9b06d24 100644 (file)
--- a/meta
+++ b/meta
@@ -1,6 +1,6 @@
 Version: 1
-Previous: b4199d9e73226677039d2546cef64ad14e0edb3b
-Head: 91fe975cfd256b692a7b87583e7ed36dbc5852e6
+Previous: 12306b56bbdd52bc1ea5f7dcee12732abfdb374e
+Head: 2086224308671b091ce47e765506e289a61e43c8
 Applied:
   logging: 549692c49922dce3911d97dcc6d0a2fc583ab5f7
   acm_snoop: dd5542fbaa1c5a92367d0552ef3525d5ea0a4638
@@ -9,8 +9,7 @@ Applied:
   dist-cfg: d2901f9410f4d3d57629189a4ff51571bb3b0cf3
   lower_retries: 25005d0475638542ab125b42d439d853c185402a
   locking: a3e39b20a6a68bf9cc991eba690bf5d952c566ca
-  verbose: 7e397735b0f563cc93e619bee6415cc98f3eb5a4
-  refresh-temp: 91fe975cfd256b692a7b87583e7ed36dbc5852e6
+  verbose: 2086224308671b091ce47e765506e289a61e43c8
 Unapplied:
   acme_verbose: 45cba0846874c93ef7af156bf0afe59f43d82ea6
   1.0.4: 9f452b8e59adb21b90fbdda980d25a54d4360d37

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 0190e52..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,21 +0,0 @@
-Bottom: 6e9707fc21bd4609a7ebabd414f343b37ffbd858
-Top:    8136268bd77c0eb86ebc719e7c2e7631c4e05b2b
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2010-12-03 13:54:59 -0800
-
-Refresh of verbose
-
----
-
-diff --git a/src/acm.c b/src/acm.c
-index c503013..a680b0b 100644
---- a/src/acm.c
-+++ b/src/acm.c
-@@ -36,6 +36,7 @@
- #include <string.h>
- #include <osd.h>
- #include <arpa/inet.h>
-+#include <sys/types.h>
- #include <sys/stat.h>
- #include <sys/time.h>
- #include <fcntl.h>

diff --git a/patches/verbose b/patches/verbose
index 3f86cf0594dafb081646f33d366bdf5b2ffb314e..31a7115d7230152338bf8ac486a8acebb09c8254 100644 (file)
--- a/patches/verbose
+++ b/patches/verbose
@@ -1,5 +1,5 @@
 Bottom: 32588281780667752a506dba6c2782233250df24
-Top:    6e9707fc21bd4609a7ebabd414f343b37ffbd858
+Top:    8136268bd77c0eb86ebc719e7c2e7631c4e05b2b
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2010-12-03 12:52:49 -0800
 
@@ -38,6 +38,18 @@ index 2cb422a..9477d29 100644
                fprintf(f, "%s %s %d 0x%x\n", ip, verbs[dev_index]->device->name, port, pkey);
        }
        ret = 0;
+diff --git a/src/acm.c b/src/acm.c
+index c503013..a680b0b 100644
+--- a/src/acm.c
++++ b/src/acm.c
+@@ -36,6 +36,7 @@
+ #include <string.h>
+ #include <osd.h>
+ #include <arpa/inet.h>
++#include <sys/types.h>
+ #include <sys/stat.h>
+ #include <sys/time.h>
+ #include <fcntl.h>
 diff --git a/src/acme.c b/src/acme.c
 index 552f42a..655c318 100644
 --- a/src/acme.c