refresh

diff --git a/meta b/meta
index 642ceb276602fb5d45002dec1e97fa6a4226dc73..e9e6db60c754ee5ab2325afcca5b61b703064801 100644 (file)
--- a/meta
+++ b/meta
@@ -1,6 +1,6 @@
 Version: 1
-Previous: c3654f062cf630e65fc95eed49d41c7bee1ed6be
-Head: 4164bf54a0878118bec79914bcd5478105651d5a
+Previous: 09c9529b81bad8cb7e7668761999eef8f34300a0
+Head: e8d666cc68126a0443e740fa4db9e44455f5dbfd
 Applied:
   logging: 549692c49922dce3911d97dcc6d0a2fc583ab5f7
   acm_snoop: dd5542fbaa1c5a92367d0552ef3525d5ea0a4638
@@ -9,8 +9,7 @@ Applied:
   dist-cfg: d2901f9410f4d3d57629189a4ff51571bb3b0cf3
   lower_retries: 25005d0475638542ab125b42d439d853c185402a
   locking: 558e5577364aec3531c54b28def6e16f0c926524
-  verbose: d293d2201524057a6dddbd641b9add2719fa9955
-  refresh-temp: 4164bf54a0878118bec79914bcd5478105651d5a
+  verbose: e8d666cc68126a0443e740fa4db9e44455f5dbfd
 Unapplied:
   acme_verbose: 45cba0846874c93ef7af156bf0afe59f43d82ea6
   1.0.4: 9f452b8e59adb21b90fbdda980d25a54d4360d37

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 7d9b4c0..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,21 +0,0 @@
-Bottom: a2ee01245adbca4121dd5221ed9b3f3f04683d5d
-Top:    8136268bd77c0eb86ebc719e7c2e7631c4e05b2b
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2010-12-03 13:56:33 -0800
-
-Refresh of verbose
-
----
-
-diff --git a/src/acm.c b/src/acm.c
-index 9888387..a680b0b 100644
---- a/src/acm.c
-+++ b/src/acm.c
-@@ -39,6 +39,7 @@
- #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 9b5dd733c9c635bc5218319d8ae6deae0ce68268..3f55effd4340a2cc06b5717866e20812681ea514 100644 (file)
--- a/patches/verbose
+++ b/patches/verbose
@@ -1,5 +1,5 @@
 Bottom: 2895e38b888c2de8c2681ec086046cb241282cc2
-Top:    a2ee01245adbca4121dd5221ed9b3f3f04683d5d
+Top:    8136268bd77c0eb86ebc719e7c2e7631c4e05b2b
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2010-12-03 12:52:49 -0800
 
@@ -38,18 +38,6 @@ 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 a680b0b..9888387 100644
---- a/src/acm.c
-+++ b/src/acm.c
-@@ -39,7 +39,6 @@
- #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/src/acme.c b/src/acme.c
 index 552f42a..655c318 100644
 --- a/src/acme.c