refresh

diff --git a/meta b/meta
index c4085dfacd5612f002e3d266e34d3c8f691b0233..a8fdd073e0cc088f3e51a5e299c3c218c2f6ab5b 100644 (file)
--- a/meta
+++ b/meta
@@ -1,6 +1,6 @@
 Version: 1
-Previous: 964cae1a326cc1cc3767da8de126ebe63d7a943b
-Head: a215d576637b7a6811cd6068e83b8e1322d53792
+Previous: c79d5a5bc5cac2a2352761c1a94fdad471038a49
+Head: f134178acabc80b0d243a84ea37d997285405c21
 Applied:
   logging: 549692c49922dce3911d97dcc6d0a2fc583ab5f7
   acm_snoop: dd5542fbaa1c5a92367d0552ef3525d5ea0a4638
@@ -9,8 +9,7 @@ Applied:
   dist-cfg: d2901f9410f4d3d57629189a4ff51571bb3b0cf3
   lower_retries: 25005d0475638542ab125b42d439d853c185402a
   locking: a3e39b20a6a68bf9cc991eba690bf5d952c566ca
-  verbose: 2086224308671b091ce47e765506e289a61e43c8
-  refresh-temp: a215d576637b7a6811cd6068e83b8e1322d53792
+  verbose: f134178acabc80b0d243a84ea37d997285405c21
 Unapplied:
   acme_verbose: 45cba0846874c93ef7af156bf0afe59f43d82ea6
   1.0.4: 9f452b8e59adb21b90fbdda980d25a54d4360d37

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 2596302..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,24 +0,0 @@
-Bottom: 8136268bd77c0eb86ebc719e7c2e7631c4e05b2b
-Top:    1cfc99531a549c8306d14dafeeec358fcff76c2a
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2010-12-03 13:55:24 -0800
-
-Refresh of verbose
-
----
-
-diff --git a/src/acm.c b/src/acm.c
-index a680b0b..3a5404a 100644
---- a/src/acm.c
-+++ b/src/acm.c
-@@ -36,10 +36,8 @@
- #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>
- #include <infiniband/acm.h>
- #include <infiniband/umad.h>
- #include <infiniband/verbs.h>

diff --git a/patches/verbose b/patches/verbose
index 31a7115d7230152338bf8ac486a8acebb09c8254..0c6a51077eaf5caa09e388eeae8b0d6a6e0f361d 100644 (file)
--- a/patches/verbose
+++ b/patches/verbose
@@ -1,5 +1,5 @@
 Bottom: 32588281780667752a506dba6c2782233250df24
-Top:    8136268bd77c0eb86ebc719e7c2e7631c4e05b2b
+Top:    1cfc99531a549c8306d14dafeeec358fcff76c2a
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2010-12-03 12:52:49 -0800
 
@@ -39,17 +39,17 @@ index 2cb422a..9477d29 100644
        }
        ret = 0;
 diff --git a/src/acm.c b/src/acm.c
-index c503013..a680b0b 100644
+index c503013..3a5404a 100644
 --- a/src/acm.c
 +++ b/src/acm.c
-@@ -36,6 +36,7 @@
- #include <string.h>
- #include <osd.h>
+@@ -38,7 +38,6 @@
  #include <arpa/inet.h>
-+#include <sys/types.h>
  #include <sys/stat.h>
  #include <sys/time.h>
- #include <fcntl.h>
+-#include <fcntl.h>
+ #include <infiniband/acm.h>
+ #include <infiniband/umad.h>
+ #include <infiniband/verbs.h>
 diff --git a/src/acme.c b/src/acme.c
 index 552f42a..655c318 100644
 --- a/src/acme.c