pop

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

diff --git a/patches/rs-async-nonblock b/patches/rs-async-nonblock
index 22a812219d8d06601ba0177b9498bf002fc53b78..6da105d98647647c8eb5e134f0ccdf994282a319 100644 (file)
--- a/patches/rs-async-nonblock
+++ b/patches/rs-async-nonblock
@@ -1,5 +1,5 @@
-Bottom: 0811012347b0773da571fc97d17714e8e0e598f4
-Top:    8fde2d81ba8df54624406b0a9293e9aca478d450
+Bottom: 739e2ac1d4183624ea78971f116d0b6be0266833
+Top:    8f6ed845f1d4f512d6113d3b4ff5776c7e330fc4
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-05-16 15:23:41 -0700
 
@@ -24,7 +24,7 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 ---
 
 diff --git a/examples/rstream.c b/examples/rstream.c
-index ecaa779..181d54a 100644
+index b73d59a..2b25ef5 100644
 --- a/examples/rstream.c
 +++ b/examples/rstream.c
 @@ -57,6 +57,7 @@ static int use_rs = 1;
@@ -116,7 +116,7 @@ index ecaa779..181d54a 100644
  }
  
  static int run(void)
-@@ -564,6 +579,9 @@ int main(int argc, char **argv)
+@@ -562,6 +577,9 @@ int main(int argc, char **argv)
                }
        }