pop

diff --git a/meta b/meta
index fe641f59391faecd37a8be69a0f96e2800f0b9b6..6b8eedae82f15e7fdcbb2747aa24b628655a996a 100644 (file)
--- a/meta
+++ b/meta
@@ -1,11 +1,11 @@
 Version: 1
-Previous: 9fa35ecda6dba54d47136602218a36f2ccb1ca4f
-Head: b6e7734ccc3d5e6103ae137025ec71b6bea39a63
+Previous: 52dfef85dbf4974719a99c9c20b89c14a47e5523
+Head: 87a68f8ca7615179b7c6dfc54e660949d7c5742f
 Applied:
   deam: 3eb8f395f9a52f04c5b408812e743566e6d673fe
   braces: b6e7734ccc3d5e6103ae137025ec71b6bea39a63
+  counters: 87a68f8ca7615179b7c6dfc54e660949d7c5742f
 Unapplied:
-  counters: 0807eb0ca9d79773cfc846ed24e708d9a5842164
   acm1.0.5: 1b225173756cfcec4d81d26b1160ebae7644261b
   name2ip: 8e00708e882239292492e13aa51c82042255933c
   addr_size: 8de02c47fbf595132105a7050ad6f755f49f9a7a

diff --git a/patches/counters b/patches/counters
index 89fc91b73e1115f8d484a24eacbe7867d8d54ae7..eab11bbe7254ff6333955a31d5b7b89597f9caad 100644 (file)
--- a/patches/counters
+++ b/patches/counters
@@ -1,5 +1,5 @@
-Bottom: fad6610d1d2786b12bafb5cd923f53cfb674ebdb
-Top:    2cff1f10bb9b3c74a5f48fbc4c4e8e6ba8b0f971
+Bottom: 8c494522d92d53cdd3122c29716c08dda270b21e
+Top:    24b90b7bc391f985713d5e23a631bcae818e7c1d
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2011-06-27 10:29:36 -0700
 
@@ -81,7 +81,7 @@ index acf6a1d..af57d0b 100644
  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 8b01adb..1f9d2e8 100644
+index 7b0639a..8e36885 100644
 --- a/src/acm.c
 +++ b/src/acm.c
 @@ -47,7 +47,7 @@
@@ -283,9 +283,9 @@ index 8b01adb..1f9d2e8 100644
 -      int op, daemon = 1;
 +      int i, op, daemon = 1;
  
-       while ((op = getopt(argc, argv, "DA:O:")) != -1) {
+       while ((op = getopt(argc, argv, "DPA:O:")) != -1) {
                switch (op) {
-@@ -3120,6 +3165,9 @@ int CDECL_FUNC main(int argc, char **argv)
+@@ -3123,6 +3168,9 @@ int CDECL_FUNC main(int argc, char **argv)
        DListInit(&dev_list);
        DListInit(&timeout_list);
        event_init(&timeout_event);