pop

diff --git a/meta b/meta
index b85d449c7757ac95810ba8688457527a76c36074..d6488d7c22b2a42224ab51e034a029a3e8741a81 100644 (file)
--- a/meta
+++ b/meta
@@ -1,6 +1,6 @@
 Version: 1
-Previous: 574ba58c97bbbce7fdb58594954fbf8213d22e52
-Head: bf00219bcc090cdfdd4fb155e3de41691e514e27
+Previous: 273daea090e35c2c77262d6bd778c86650417b0d
+Head: b0e76349b3f3c79e19f09aaf54c4279d78dabfb4
 Applied:
   logging: 549692c49922dce3911d97dcc6d0a2fc583ab5f7
   acm_snoop: dd5542fbaa1c5a92367d0552ef3525d5ea0a4638
@@ -13,8 +13,8 @@ Applied:
   dbg_1: 4009e8d08cde895a2c84225a8d5a1f275b15ced9
   no_addr: 20e051b4c40928fcddac0d64375acf52bffe86f7
   log_port: bf00219bcc090cdfdd4fb155e3de41691e514e27
+  nodelay: b0e76349b3f3c79e19f09aaf54c4279d78dabfb4
 Unapplied:
-  nodelay: 89973fbe5f8912da1987de5038402b3f7fd209a6
   acme_dest: 1428730a12a1b3a8f99d58c0658efe1f59179ce1
   show_err: c3e388503a184f2ef86785e4186a89aaf75ff235
   mult_dest: 7b7e4c85ee35ecc407a0c17621e400d97983681b

diff --git a/patches/nodelay b/patches/nodelay
index b15f22b94d00eeebe19e107121719564f8dcc86a..f8329540cbf06b17db1a76cd70940e403f81a883 100644 (file)
--- a/patches/nodelay
+++ b/patches/nodelay
@@ -1,5 +1,5 @@
-Bottom: 93774bee01ee5cec82073e79735833fd36f4d69d
-Top:    f43e2380ce252f454954ec9182170afe7f33de01
+Bottom: 044c4501996e9d17f7615a6af23ece72b4cf98f4
+Top:    6f14211892536dea81822fd014bde92a772ab5d9
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2010-12-06 13:07:41 -0800
 
@@ -50,7 +50,7 @@ index 0c0e332..52000a3 100644
  With this option, the ib_acme utility automatically generates the address\r
  configuration file acm_addr.cfg.  The generated file is\r
 diff --git a/src/acm.c b/src/acm.c
-index 13af503..ed6ce74 100644
+index d9a81d9..08f233c 100644
 --- a/src/acm.c
 +++ b/src/acm.c
 @@ -1914,8 +1914,7 @@ acm_svr_verify_resolve(struct acm_resolve_msg *msg,