pop

diff --git a/meta b/meta
index b93cbd7eb06fe7bb56c3c5dfa4eba050b4ef0e57..98da87672de9fa533f8834299053127b63eb3ca3 100644 (file)
--- a/meta
+++ b/meta
@@ -1,6 +1,6 @@
 Version: 1
-Previous: 4af1a12777a3df08e301c1397c5a87f445e3c812
-Head: d0bffbd0765be6a31be97aee1a336681c49e4d99
+Previous: 992d918cc483727fa855ab3d05161665690c4a09
+Head: 94e0f52806e52e9a441f25cb3bc30bebacd2e1d1
 Applied:
   mc-refcnt: c7d28b35d64333c262de3ec972c426423dadccf9
   af_ib: c366c39d4afc939932efc2f5158ae332161369bf
@@ -8,8 +8,8 @@ Applied:
   ipv4: ee6aa496369bc10e9975aa1e013445050a1c4510
   err-resolve-gid: b05ca7c6f1bbced527ed02a9d7cd25a28bf8bf38
   lid: d0bffbd0765be6a31be97aee1a336681c49e4d99
+  daemonize: 94e0f52806e52e9a441f25cb3bc30bebacd2e1d1
 Unapplied:
-  daemonize: f5e4961dbf32ce49e2ef1fcb973455bc4ae364fc
   rel-1.0.6: 6b1139f032257843033701e76968dba6580b5f3f
   dev-name2ip: 8e00708e882239292492e13aa51c82042255933c
   dev-addrsize: 8de02c47fbf595132105a7050ad6f755f49f9a7a

diff --git a/patches/daemonize b/patches/daemonize
index fb03e7fdfe178303914cfd693db1777e185ebd13..83f6eca343e30eff8c5a21a8abad3da35bf1ffd2 100644 (file)
--- a/patches/daemonize
+++ b/patches/daemonize
@@ -1,5 +1,5 @@
-Bottom: 24a3b4db7b7d119659eba135566a3dbefcec2589
-Top:    b0584357c8d1db0b3031585af39c032b9fdd34d5
+Bottom: aa257fb159401d03e22d6da8501895fe34e69bed
+Top:    6334ead260a5f39e453ccbed375f18d4719a9a45
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-03-30 16:31:08 -0700
 
@@ -620,7 +620,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 d53fc37..8f670f1 100644
+index 5041b1c..9d2361e 100644
 --- a/src/acm.c
 +++ b/src/acm.c
 @@ -205,11 +205,12 @@ static atomic_t counter[ACM_MAX_COUNTER];
@@ -665,7 +665,7 @@ index d53fc37..8f670f1 100644
  
  int CDECL_FUNC main(int argc, char **argv)
 diff --git a/src/acme.c b/src/acme.c
-index f9ea74f..9eae065 100644
+index d3f8174..e6ae188 100644
 --- a/src/acme.c
 +++ b/src/acme.c
 @@ -43,7 +43,7 @@