pop

diff --git a/meta b/meta
index b9ac2615fc7f9316f3bb0fcb7f58b738bd5ad333..05b3f35a69490d649713458684a780f77606da2b 100644 (file)
--- a/meta
+++ b/meta
@@ -1,12 +1,12 @@
 Version: 1
-Previous: a53b69e6eded5f976b052572fca01692df7401e4
-Head: 49e4eb6354a6b75a966040a156a8441ee5b18ba3
+Previous: 2893fa56924ea53e5f2d862735414db152eee5b0
+Head: 53932f9c5925f54b15f98fe644d872d7ac4722a7
 Applied:
   reuseaddr: 5ce7d9c48d082fd1959918e9134f4bdd85c402d9
   rs-nodelay: b0bd56d129bc21e6683e742da4eaac5b7709067c
   rs-delay: 49e4eb6354a6b75a966040a156a8441ee5b18ba3
+  rs-async-opt: 53932f9c5925f54b15f98fe644d872d7ac4722a7
 Unapplied:
-  rs-async-opt: 0ee1dfc9ad50f07fd3708ebb04cb92e0fb2f41d5
   rs-async-nonblock: 992a8c5abcb0199fd6214fd31b6695573ccb5bf5
   preload: 5dfe7abc07064485c5100e04e5412279244c2bc3
 Hidden:

diff --git a/patches/rs-async-opt b/patches/rs-async-opt
index 6949ae6bffd5fcc98dd4fa46fbf44ab9af0b5ba4..4d673435cea04472737ffa013ecaecf772a7c5c4 100644 (file)
--- a/patches/rs-async-opt
+++ b/patches/rs-async-opt
@@ -1,5 +1,5 @@
-Bottom: 1e3526d39b2591bb10a08bfed2622f05f82b1bd8
-Top:    fb3f150e6146757e6bdb884182c4b19457bd6b6b
+Bottom: 891a16cb25ad39db51200ed1eb3262b8f982b9bd
+Top:    0811012347b0773da571fc97d17714e8e0e598f4
 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 7f39b29..decb204 100644
+index 825c4de..ecaa779 100644
 --- a/examples/rstream.c
 +++ b/examples/rstream.c
-@@ -561,7 +561,7 @@ int main(int argc, char **argv)
+@@ -556,7 +556,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");