pop

diff --git a/meta b/meta
index 1300446d702c8241c1b3774ee3450f7c7b211727..e55d7e1229fdac97f50f8552c3a87902864c47bc 100644 (file)
--- a/meta
+++ b/meta
@@ -1,6 +1,6 @@
 Version: 1
-Previous: 7296f04125da49022e2e2fa585ad6c5f029674e7
-Head: fdb0bf40c51be7713f7cf670de0974071bdcbabb
+Previous: 5eab16cec8cf5de54c9e4ed18d83b5877f26a5b3
+Head: 4df93d77448b4a1729f2c7ff4ccd5a5cfcec2492
 Applied:
   logging: 549692c49922dce3911d97dcc6d0a2fc583ab5f7
   acm_snoop: dd5542fbaa1c5a92367d0552ef3525d5ea0a4638
@@ -9,17 +9,17 @@ Applied:
   dist-cfg: d2901f9410f4d3d57629189a4ff51571bb3b0cf3
   lower_retries: 25005d0475638542ab125b42d439d853c185402a
   locking: fdb0bf40c51be7713f7cf670de0974071bdcbabb
+  verbose: 7d3eb666f178578cfd1b9538dfe0a1837212af34
+  dbg_1: 7f1fde0fec539348e38ef7c41b2548cc3613ab4a
+  no_addr: e8252469c40c67bf4ba497b751dd4de394c222ad
+  log_port: 3552e1cdc8aa9274dff4c314d8cbcfc5ac2e1086
+  nodelay: 89973fbe5f8912da1987de5038402b3f7fd209a6
+  acme_dest: 1428730a12a1b3a8f99d58c0658efe1f59179ce1
+  show_err: c3e388503a184f2ef86785e4186a89aaf75ff235
+  mult_dest: 7b7e4c85ee35ecc407a0c17621e400d97983681b
+  addrinfo: a05035a017ce9a31bda79b899afdaed6859a6b9b
+  notes_man: c4959298c0958e3cc7179fdd144a94b4e7d946bf
+  def_log: 4df93d77448b4a1729f2c7ff4ccd5a5cfcec2492
 Unapplied:
-  verbose: 572c8094123639a268eb1cbb92f7947ffbdd406b
-  dbg_1: 3258ebd9b3f17653231089184f29ee2352be9d46
-  no_addr: 775cf275e0feddd7b884ded8cdc341a919e4f9a6
-  log_port: 92f81cd1f299db9d83aa21d794cfdfc4c4b5794f
-  nodelay: 90b41e985e1f478cda3e4821709cb2ed5e27ee7f
-  acme_dest: b7ec8fce4adac1b6e970529e41ff1c936f4be27b
-  show_err: 47d8e33e2f36df1e3b163fcf7e8b0b56604fb944
-  mult_dest: 1c8469be405d19304d47fcaf95e7d4aec574a6fc
-  addrinfo: ea78077f0d4a7c2bb513531fac18f03573578b3c
-  notes_man: 77cdfebd3c888052e7dd752f0191dfca26a2d137
-  def_log: a5b14c80b36a4e5b10f076d73383c9b66876c989
   1.0.4: 8bd14400a546cabd3c62d8e190b9957dcbe0702e
 Hidden:

diff --git a/patches/acme_dest b/patches/acme_dest
index 86bd0a429da691dce050a5781893b61f934066a3..bdd6f8a5769de28fdb06912b61ee0786be07dec1 100644 (file)
--- a/patches/acme_dest
+++ b/patches/acme_dest
@@ -1,5 +1,5 @@
-Bottom: a26298c8af16d66ba9e4959cbc2f81521bf16570
-Top:    9fdabc325eba3a5ebf30ecea2f042a5c6f338ef4
+Bottom: f43e2380ce252f454954ec9182170afe7f33de01
+Top:    2bfe540256ee2c6d427f7e5350c72366adc10ccf
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2010-12-06 16:13:22 -0800
 

diff --git a/patches/addrinfo b/patches/addrinfo
index ffbd8b5c7a87967b4ffbf893b06c958ea38453a2..a419700fc9f133fadd064beafdfc9f927ad4b259 100644 (file)
--- a/patches/addrinfo
+++ b/patches/addrinfo
@@ -1,5 +1,5 @@
-Bottom: ad882cbf5ccb5b39d50b3d141607e262852a2abd
-Top:    d567db5e39236562dd4e933b9516b73603856409
+Bottom: 9de01f76eb82f5eb1e57563193280bafd10c790c
+Top:    8de46915738c563e2523c3dabe6f8bcf1aa81420
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2010-12-07 13:44:44 -0800
 

diff --git a/patches/dbg_1 b/patches/dbg_1
index adc618a2e013ac2fad6e5e897d98b0d96c45fb35..fccc890e9d1908e8df52eb87f8a4f47e219504f3 100644 (file)
--- a/patches/dbg_1
+++ b/patches/dbg_1
@@ -1,5 +1,5 @@
-Bottom: 428eeeccea1e0579086b369b1d79d5753dae8dd1
-Top:    d0945430109cd6ba71167e8ffaa04e246e66f5d6
+Bottom: 4cb87210f5e6b323a5c0dd372ccda6e652bd2c80
+Top:    5564da342fb659b4680860c3a9759efd77db7596
 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 a680b0b..9ff81c4 100644
+index bda18b5..de54832 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

diff --git a/patches/def_log b/patches/def_log
index 1185a269cb2146355317a41425a2419f7ce97ace..ef90a1a0572d2bd973a0945f0110476c80fe273f 100644 (file)
--- a/patches/def_log
+++ b/patches/def_log
@@ -1,5 +1,5 @@
-Bottom: ed3b4c384899490638369a7bde63f5f7484e691b
-Top:    74a2df92df8183f35eb98e47ce0facf8b6db2d63
+Bottom: 87c5368e2f4e4c46ffd6be7d4d714bc7619f0c38
+Top:    6df2a5f7fa6ccb0df12b114a389e8b39b9b0dc36
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2010-12-08 11:34:36 -0800
 
@@ -15,7 +15,7 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 ---
 
 diff --git a/src/acm.c b/src/acm.c
-index 0a9c1c9..1e20325 100644
+index ed6ce74..757871e 100644
 --- a/src/acm.c
 +++ b/src/acm.c
 @@ -209,7 +209,7 @@ PER_THREAD char log_data[ACM_MAX_ADDRESS];

diff --git a/patches/log_port b/patches/log_port
index 9510d390ca34979beb2915b6ab16c53dd5fa7c32..640a153bba2fc9af20d2a1c56c392812a06dd08d 100644 (file)
--- a/patches/log_port
+++ b/patches/log_port
@@ -1,5 +1,5 @@
-Bottom: 0209478b5afee20406cfc23e215f4b1f19855e7c
-Top:    5cb19eb81ed40ac6bba59f5d10974e9fc25a49af
+Bottom: 6b06ea561b2b860919b8f7f649491264780cedf6
+Top:    93774bee01ee5cec82073e79735833fd36f4d69d
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2010-12-06 11:51:38 -0800
 
@@ -15,7 +15,7 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 ---
 
 diff --git a/src/acm.c b/src/acm.c
-index aa26fc5..ceb72f6 100644
+index fbae482..13af503 100644
 --- a/src/acm.c
 +++ b/src/acm.c
 @@ -1597,6 +1597,7 @@ static void CDECL_FUNC acm_retry_handler(void *context)

diff --git a/patches/mult_dest b/patches/mult_dest
index 221d892c6e411522c8abfae0ea56a59959b1c4b6..5c78108613b8e8ac3bf30ba8af7bb710e9640f00 100644 (file)
--- a/patches/mult_dest
+++ b/patches/mult_dest
@@ -1,5 +1,5 @@
-Bottom: 32a7b8b2ffc23b410dc19c50a9bf68e149662635
-Top:    ad882cbf5ccb5b39d50b3d141607e262852a2abd
+Bottom: 52cd9d1676566efbcf414bb677fdab6b145297b6
+Top:    9de01f76eb82f5eb1e57563193280bafd10c790c
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2010-12-07 09:39:52 -0800
 

diff --git a/patches/no_addr b/patches/no_addr
index 41137825ab8c5051c0d892ab44622a6be411be93..2b948143692d986108ceb9f422b41e2844749688 100644 (file)
--- a/patches/no_addr
+++ b/patches/no_addr
@@ -1,5 +1,5 @@
-Bottom: d0945430109cd6ba71167e8ffaa04e246e66f5d6
-Top:    0209478b5afee20406cfc23e215f4b1f19855e7c
+Bottom: 5564da342fb659b4680860c3a9759efd77db7596
+Top:    6b06ea561b2b860919b8f7f649491264780cedf6
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2010-12-06 11:06:47 -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 9ff81c4..aa26fc5 100644
+index de54832..fbae482 100644
 --- a/src/acm.c
 +++ b/src/acm.c
 @@ -203,6 +203,7 @@ static SOCKET listen_socket;
@@ -82,7 +82,7 @@ index 9ff81c4..aa26fc5 100644
  static int acm_open_lock_file(void)
  {
        int lock_fd;
-@@ -2813,6 +2824,11 @@ int CDECL_FUNC main(int argc, char **argv)
+@@ -2818,6 +2829,11 @@ int CDECL_FUNC main(int argc, char **argv)
        DListInit(&timeout_list);
        event_init(&timeout_event);
  
@@ -94,7 +94,7 @@ index 9ff81c4..aa26fc5 100644
        umad_init();
        ibdev = ibv_get_device_list(&dev_cnt);
        if (!ibdev) {
-@@ -2825,6 +2841,11 @@ int CDECL_FUNC main(int argc, char **argv)
+@@ -2830,6 +2846,11 @@ int CDECL_FUNC main(int argc, char **argv)
                acm_open_dev(ibdev[i]);
  
        ibv_free_device_list(ibdev);

diff --git a/patches/nodelay b/patches/nodelay
index 431a76b5c4abee984d114d28c62c2287d8813cbb..b15f22b94d00eeebe19e107121719564f8dcc86a 100644 (file)
--- a/patches/nodelay
+++ b/patches/nodelay
@@ -1,5 +1,5 @@
-Bottom: 5cb19eb81ed40ac6bba59f5d10974e9fc25a49af
-Top:    a26298c8af16d66ba9e4959cbc2f81521bf16570
+Bottom: 93774bee01ee5cec82073e79735833fd36f4d69d
+Top:    f43e2380ce252f454954ec9182170afe7f33de01
 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 ceb72f6..0a9c1c9 100644
+index 13af503..ed6ce74 100644
 --- a/src/acm.c
 +++ b/src/acm.c
 @@ -1914,8 +1914,7 @@ acm_svr_verify_resolve(struct acm_resolve_msg *msg,

diff --git a/patches/notes_man b/patches/notes_man
index a8be2723897bb0eaf709ba407af2b0803ff0939e..ffb9c9ee959e32c3b286a2b963ae746b500d74e0 100644 (file)
--- a/patches/notes_man
+++ b/patches/notes_man
@@ -1,5 +1,5 @@
-Bottom: d567db5e39236562dd4e933b9516b73603856409
-Top:    ed3b4c384899490638369a7bde63f5f7484e691b
+Bottom: 8de46915738c563e2523c3dabe6f8bcf1aa81420
+Top:    87c5368e2f4e4c46ffd6be7d4d714bc7619f0c38
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2010-12-08 11:05:34 -0800
 

diff --git a/patches/show_err b/patches/show_err
index 5fc5cbfe1be84455983a06af48c71dd7ce4a2083..437010c89f0b3410b6d6fa76e8c7256d0e39bbd9 100644 (file)
--- a/patches/show_err
+++ b/patches/show_err
@@ -1,5 +1,5 @@
-Bottom: 9fdabc325eba3a5ebf30ecea2f042a5c6f338ef4
-Top:    32a7b8b2ffc23b410dc19c50a9bf68e149662635
+Bottom: 2bfe540256ee2c6d427f7e5350c72366adc10ccf
+Top:    52cd9d1676566efbcf414bb677fdab6b145297b6
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2010-12-07 07:58:54 -0800
 

diff --git a/patches/verbose b/patches/verbose
index 8528aa26837f42e1e053d094dc3593e80af63155..c90aebf2a66a309a25206e0a612f3a113bd48161 100644 (file)
--- a/patches/verbose
+++ b/patches/verbose
@@ -1,5 +1,5 @@
-Bottom: 2895e38b888c2de8c2681ec086046cb241282cc2
-Top:    428eeeccea1e0579086b369b1d79d5753dae8dd1
+Bottom: b4a0745eb9fbe073654d6057445a51e490d3711d
+Top:    4cb87210f5e6b323a5c0dd372ccda6e652bd2c80
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2010-12-03 12:52:49 -0800