refresh

diff --git a/meta b/meta
index a190275ee8d48d8758300621de2ee3db70b45821..0f8679b50dfcf1d030ae7ca59880f8298bced688 100644 (file)
--- a/meta
+++ b/meta
@@ -1,6 +1,6 @@
 Version: 1
-Previous: 7c566f583583a1483921372bd99228453a78f8eb
-Head: a04d8e1d6d2212d67abb205a660ca057d7a86e23
+Previous: 47b1629d3c6b3a4f3c9a18fb0216ab858cebea97
+Head: 572c8094123639a268eb1cbb92f7947ffbdd406b
 Applied:
   logging: 549692c49922dce3911d97dcc6d0a2fc583ab5f7
   acm_snoop: dd5542fbaa1c5a92367d0552ef3525d5ea0a4638
@@ -9,8 +9,7 @@ Applied:
   dist-cfg: d2901f9410f4d3d57629189a4ff51571bb3b0cf3
   lower_retries: 25005d0475638542ab125b42d439d853c185402a
   locking: 558e5577364aec3531c54b28def6e16f0c926524
-  verbose: 15cf7a7a260a694923bcb5c9181b10b0f02108f7
-  refresh-temp: a04d8e1d6d2212d67abb205a660ca057d7a86e23
+  verbose: 572c8094123639a268eb1cbb92f7947ffbdd406b
 Unapplied:
   dbg_1: 0b650c149079cd8e1593504492a9940521fb9c6d
   no_addr: 4d7174e927130db17a5ff83f9279ea4c54fde2fa

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index fd4989c..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,31 +0,0 @@
-Bottom: 4bccca2454ae52dbf3c0da725b1e2c636ef30617
-Top:    428eeeccea1e0579086b369b1d79d5753dae8dd1
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2010-12-06 15:22:00 -0800
-
-Refresh of verbose
-
----
-
-diff --git a/man/ib_acme.1 b/man/ib_acme.1
-index ba9086a..0c0e332 100644
---- a/man/ib_acme.1
-+++ b/man/ib_acme.1
-@@ -1,4 +1,4 @@
--.TH "ib_acme" 7 "2009-09-09" "ib_acme" "ib_acme" ib_acme\r
-+.TH "ib_acme" 7 "2010-12-06" "ib_acme" "ib_acme" ib_acme\r
- .SH NAME\r
- ib_acme \- test and configuration utility for the IB ACM\r
- .SH SYNOPSIS\r
-@@ -47,6 +47,11 @@ assigned to IPoIB device instances.
- With this option, the ib_acme utility automatically generates the option\r
- configuration file acm_opts.cfg.  The generated file is currently generated\r
- using static information.\r
-+.TP\r
-+\-V\r
-+Enables verbose output.  When combined with -A or -O options, ib_acme will\r
-+display additional details, such as generated address information saved\r
-+to the acm_addr.cfg file.\r
- .SH "NOTES"\r
- The ib_acme utility performs two main functions.  With the -A and -O options,\r
- it automatically generates address or options configuration files.  The

diff --git a/patches/verbose b/patches/verbose
index 5050cd779414f56b78fb6bdfd5d405e5d842b949..8528aa26837f42e1e053d094dc3593e80af63155 100644 (file)
--- a/patches/verbose
+++ b/patches/verbose
@@ -1,5 +1,5 @@
 Bottom: 2895e38b888c2de8c2681ec086046cb241282cc2
-Top:    4bccca2454ae52dbf3c0da725b1e2c636ef30617
+Top:    428eeeccea1e0579086b369b1d79d5753dae8dd1
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2010-12-03 12:52:49 -0800
 
@@ -38,6 +38,28 @@ 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/man/ib_acme.1 b/man/ib_acme.1
+index ba9086a..0c0e332 100644
+--- a/man/ib_acme.1
++++ b/man/ib_acme.1
+@@ -1,4 +1,4 @@
+-.TH "ib_acme" 7 "2009-09-09" "ib_acme" "ib_acme" ib_acme\r
++.TH "ib_acme" 7 "2010-12-06" "ib_acme" "ib_acme" ib_acme\r
+ .SH NAME\r
+ ib_acme \- test and configuration utility for the IB ACM\r
+ .SH SYNOPSIS\r
+@@ -47,6 +47,11 @@ assigned to IPoIB device instances.
+ With this option, the ib_acme utility automatically generates the option\r
+ configuration file acm_opts.cfg.  The generated file is currently generated\r
+ using static information.\r
++.TP\r
++\-V\r
++Enables verbose output.  When combined with -A or -O options, ib_acme will\r
++display additional details, such as generated address information saved\r
++to the acm_addr.cfg file.\r
+ .SH "NOTES"\r
+ The ib_acme utility performs two main functions.  With the -A and -O options,\r
+ it automatically generates address or options configuration files.  The\r
 diff --git a/src/acme.c b/src/acme.c
 index 552f42a..cc34577 100644
 --- a/src/acme.c