pop

diff --git a/meta b/meta
index a0497f0ae208a7cddb7c8e25e46833e58e27d7ee..dbc877092cd51ec66ba307e99caeed11ca1054d8 100644 (file)
--- a/meta
+++ b/meta
@@ -1,12 +1,12 @@
 Version: 1
-Previous: e809601c230d049bf8854817163279f9abcb0402
-Head: d7eefeeab4adb9234aa20d659546d9454ee32f86
+Previous: 701f8d0bfeb97e27c6740cdf5502a38fb61a395d
+Head: 7761e53b55e08d9424ae2f6cb6baecbe2a1db856
 Applied:
   reuseaddr: 5ce7d9c48d082fd1959918e9134f4bdd85c402d9
   rs-nodelay: b0bd56d129bc21e6683e742da4eaac5b7709067c
   rs-delay: d7eefeeab4adb9234aa20d659546d9454ee32f86
+  rs-async-opt: 7761e53b55e08d9424ae2f6cb6baecbe2a1db856
 Unapplied:
-  rs-async-opt: 53932f9c5925f54b15f98fe644d872d7ac4722a7
   rs-async-nonblock: a184890ccc7ad7f83a9f2c84643286c9efb2a75b
   preload: 5dfe7abc07064485c5100e04e5412279244c2bc3
 Hidden:

diff --git a/patches/rs-async-opt b/patches/rs-async-opt
index 4d673435cea04472737ffa013ecaecf772a7c5c4..2a049ccd9e010be31a16e534a905b18d71970258 100644 (file)
--- a/patches/rs-async-opt
+++ b/patches/rs-async-opt
@@ -1,5 +1,5 @@
-Bottom: 891a16cb25ad39db51200ed1eb3262b8f982b9bd
-Top:    0811012347b0773da571fc97d17714e8e0e598f4
+Bottom: 7d9e5cc230e2810cf4b2e08f71e5100c4d4d5941
+Top:    739e2ac1d4183624ea78971f116d0b6be0266833
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-05-11 10:41:02 -0700
 
@@ -11,10 +11,10 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 ---
 
 diff --git a/examples/rstream.c b/examples/rstream.c
-index 825c4de..ecaa779 100644
+index a214b1a..b73d59a 100644
 --- a/examples/rstream.c
 +++ b/examples/rstream.c
-@@ -556,7 +556,7 @@ int main(int argc, char **argv)
+@@ -554,7 +554,7 @@ int main(int argc, char **argv)
                        printf("\t[-p port_number]\n");
                        printf("\t[-T test_option]\n");
                        printf("\t    s|sockets - use standard tcp/ip sockets\n");