pop

diff --git a/meta b/meta
index cc07198271169005e619abe1a45dd3fa8a01799d..afbf6d877a5f27e932a79093b752339b8b37af13 100644 (file)
--- a/meta
+++ b/meta
@@ -1,11 +1,11 @@
 Version: 1
-Previous: 6aa5dd87b5308e93dfba29cafdc59964f1f7339e
-Head: c366c39d4afc939932efc2f5158ae332161369bf
+Previous: dfcb0897aba44e23b584dd9bd2ba186a0ba7e861
+Head: f6dd0b57f03dc39e2c64c95be6bb4b3e0ebee467
 Applied:
   mc-refcnt: c7d28b35d64333c262de3ec972c426423dadccf9
   af_ib: c366c39d4afc939932efc2f5158ae332161369bf
+  daemonize: f6dd0b57f03dc39e2c64c95be6bb4b3e0ebee467
 Unapplied:
-  daemonize: 88f657dfa31019f896f6b094f3b638b0f30cd6b5
   rel-1.0.6: d6c9b0ffcd7b9f4ead6e5d458dccf7951d1b1c3b
   dev-name2ip: 8e00708e882239292492e13aa51c82042255933c
   dev-addrsize: 8de02c47fbf595132105a7050ad6f755f49f9a7a

diff --git a/patches/daemonize b/patches/daemonize
index 1bff2c330e2690614ee254d9d3d29f69899d78f3..521b3be9e352e5391bfbbb13a858af64bddfbb65 100644 (file)
--- a/patches/daemonize
+++ b/patches/daemonize
@@ -1,5 +1,5 @@
-Bottom: e08db13f657dd29e1d20ddd6d5e6e9d8d4abbc75
-Top:    64eb4bbb6a011761491e6306489418b652e38bd6
+Bottom: 401468071c1fab953d36f230eeeb71f1a45376c5
+Top:    d6adbf9c14e65bd99898548a1328a5122dbfccc7
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-03-30 16:31:08 -0700
 
@@ -565,7 +565,7 @@ index f26ffb8..c0c63fc 100644
 -ib_acme(1), ib_acm(1)\r
 +ib_acme(1), ibacm(1)\r
 diff --git a/src/acm.c b/src/acm.c
-index 6089785..8b5ff43 100644
+index d53fc37..8f670f1 100644
 --- a/src/acm.c
 +++ b/src/acm.c
 @@ -205,11 +205,12 @@ static atomic_t counter[ACM_MAX_COUNTER];