pop

diff --git a/meta b/meta
index 21b96cd30a1488e735f9eccbf3f45ceed16a513c..42c7454c9560560f21ac7be3643dbfa7664c5ce4 100644 (file)
--- a/meta
+++ b/meta
@@ -1,6 +1,6 @@
 Version: 1
-Previous: 957d9489ebb79e895047e71187737bd9d3bfea14
-Head: 6f096f8ddb8a734073e9f0d98cfec82e5dc69097
+Previous: b93d07b64494cf1784f2a3dbc17e1f5a0bdad199
+Head: 4009e8d08cde895a2c84225a8d5a1f275b15ced9
 Applied:
   logging: 549692c49922dce3911d97dcc6d0a2fc583ab5f7
   acm_snoop: dd5542fbaa1c5a92367d0552ef3525d5ea0a4638
@@ -10,8 +10,8 @@ Applied:
   lower_retries: 25005d0475638542ab125b42d439d853c185402a
   locking: 60eb7f20f1d4835c0004988322089722ea49338b
   verbose: 6f096f8ddb8a734073e9f0d98cfec82e5dc69097
+  dbg_1: 4009e8d08cde895a2c84225a8d5a1f275b15ced9
 Unapplied:
-  dbg_1: 7f1fde0fec539348e38ef7c41b2548cc3613ab4a
   no_addr: e8252469c40c67bf4ba497b751dd4de394c222ad
   log_port: 3552e1cdc8aa9274dff4c314d8cbcfc5ac2e1086
   nodelay: 89973fbe5f8912da1987de5038402b3f7fd209a6

diff --git a/patches/dbg_1 b/patches/dbg_1
index fccc890e9d1908e8df52eb87f8a4f47e219504f3..a240e386d483309afda98a6e8518cdae8e2d36c9 100644 (file)
--- a/patches/dbg_1
+++ b/patches/dbg_1
@@ -1,5 +1,5 @@
-Bottom: 4cb87210f5e6b323a5c0dd372ccda6e652bd2c80
-Top:    5564da342fb659b4680860c3a9759efd77db7596
+Bottom: e849210fc3569058adbec196b69ba738930af9d5
+Top:    a7b9c3950b48c6667df1704ea92d5cd6c090f3f1
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2010-12-06 08:42:43 -0800
 
@@ -17,7 +17,7 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 ---
 
 diff --git a/src/acm.c b/src/acm.c
-index bda18b5..de54832 100644
+index bc7124f..40f2205 100644
 --- a/src/acm.c
 +++ b/src/acm.c
 @@ -869,7 +869,7 @@ acm_client_resolve_resp(struct acm_client *client, struct acm_resolve_msg *req_m