pop

diff --git a/meta b/meta
index 86a6fbdd876d83a9c99968eba9679636c7d68d10..9f45a220d4e9af992b75d729543a3fb595bf64ad 100644 (file)
--- a/meta
+++ b/meta
@@ -1,9 +1,9 @@
 Version: 1
-Previous: 111e3626b5a9fe3d565a298cc497e96f49d34d83
-Head: 492a75211ea7e4cf60115164f45503b5b02d7798
+Previous: 03cb5c6e95ec78b5d78116eb2f29e504c71979b3
+Head: a05cd1bff001cccf8fbd7d6c8fd857f9e65671b2
 Applied:
+  counters: a05cd1bff001cccf8fbd7d6c8fd857f9e65671b2
 Unapplied:
-  counters: b491f82e1c52dd1da5e568782b5fed4e58f1f19e
   alias: 66b03436cb915b08240eb12ee1ec8779067cc5f8
   bldwrn: 4115b1d76cc4636e90343cc955bfbacf04d3bc8d
   acm1.0.5: 1b225173756cfcec4d81d26b1160ebae7644261b

diff --git a/patches/counters b/patches/counters
index b487a29ee1a94a9f789c8d701c209c2db5c73d21..19e3bb97fc0132b50cb89bd14a840f125137b57e 100644 (file)
--- a/patches/counters
+++ b/patches/counters
@@ -1,4 +1,4 @@
-Bottom: 8c494522d92d53cdd3122c29716c08dda270b21e
+Bottom: 13708d93033737fb4a684536e5e46ea1e920e387
 Top:    c3c2e3b02cd74f01128072b300204a147b5b08c2
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2011-06-27 10:29:36 -0700
@@ -68,19 +68,6 @@ index 143d512..23d8198 100644
  struct acm_msg {
        struct acm_hdr          hdr;
        uint8_t                 data[ACM_MSG_DATA_LENGTH];
-diff --git a/man/ib_acm.1 b/man/ib_acm.1
-index acf6a1d..af57d0b 100644
---- a/man/ib_acm.1
-+++ b/man/ib_acm.1
-@@ -38,7 +38,7 @@ These steps assume that the user has administrative privileges.
- .P
- 2. Install the IB ACM package.  This installs ib_acm, and ib_acme.
- .P
--3. Run 'ib_acm -D' as administrator to start the ib_acm daemon.
-+3. Run 'ib_acm' as administrator to start the ib_acm daemon.
- .P
- 4. Optionally, run 'ib_acme -d <dest_ip> -v' to verify that
- the ib_acm service is running.
 diff --git a/src/acm.c b/src/acm.c
 index 7b0639a..54b2411 100644
 --- a/src/acm.c