pop (CONFLICT)

diff --git a/meta b/meta
index f817f6a0115a0f80300c470cc4f68cae3c741fca..a58369a6c63dcd486be0773e94fdf375f446da8a 100644 (file)
--- a/meta
+++ b/meta
@@ -1,12 +1,12 @@
 Version: 1
-Previous: 2f611479b74e0ab801e22e246ca9ccb6710b0c56
+Previous: db190ce2839c88ae7ec36277a16d144a2bbe8f48
 Head: 3bd2bb6f9e9ee8c3ebd8ec3b618276ce40bdd66c
 Applied:
   reuseaddr: 5ce7d9c48d082fd1959918e9134f4bdd85c402d9
+  rs-nodelay: 3bd2bb6f9e9ee8c3ebd8ec3b618276ce40bdd66c
 Unapplied:
   rs-delay: 8f0437ec677c4752126de8667e093667dd681d56
   rs-async-opt: 0ee1dfc9ad50f07fd3708ebb04cb92e0fb2f41d5
-  rs-nodelay: 7601a5adca71f10ad1cb63292c769b7b9a35dd08
   rs-async-nonblock: 992a8c5abcb0199fd6214fd31b6695573ccb5bf5
   preload: 5dfe7abc07064485c5100e04e5412279244c2bc3
 Hidden:

diff --git a/patches/rs-nodelay b/patches/rs-nodelay
index 8b08d8715b152b980d25fac05072d1eeef1bd5a4..3d96890b72a9497b9c6edabab70f49d908e40db8 100644 (file)
--- a/patches/rs-nodelay
+++ b/patches/rs-nodelay
@@ -1,5 +1,5 @@
-Bottom: fb3f150e6146757e6bdb884182c4b19457bd6b6b
-Top:    456260422aff51feca00c1ee2db83c3d63b6e111
+Bottom: ea75b8334003947a7f09ba5f0efcec267b5143c1
+Top:    ea75b8334003947a7f09ba5f0efcec267b5143c1
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-05-16 15:16:40 -0700
 
@@ -16,51 +16,4 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 
 ---
 
-diff --git a/examples/rstream.c b/examples/rstream.c
-index decb204..8d5a22d 100644
---- a/examples/rstream.c
-+++ b/examples/rstream.c
-@@ -57,7 +57,6 @@ static int use_rs = 1;
- static int use_async;
- static int verify;
- static int flags = MSG_DONTWAIT;
--static int no_delay = 1;
- static int custom;
- static int iterations = 1;
- static int transfer_size = 1000;
-@@ -324,10 +323,8 @@ static void set_options(int rs)
-                       break;
-       }
- 
--      if (no_delay) {
--              rs_setsockopt(rs, IPPROTO_TCP, TCP_NODELAY,
--                            (void *) &no_delay, sizeof(no_delay));
--      }
-+      rs_setsockopt(rs, IPPROTO_TCP, TCP_NODELAY,
-+                    (void *) &no_delay, sizeof(no_delay));
- 
-       if (flags & MSG_DONTWAIT) {
-               rs_fcntl(rs, F_SETFL, O_NONBLOCK);
-@@ -488,11 +485,9 @@ static int set_test_opt(char *optarg)
-                       break;
-               case 'b':
-                       flags &= ~MSG_DONTWAIT;
--                      no_delay = 0;
-                       break;
-               case 'n':
-                       flags |= MSG_DONTWAIT;
--                      no_delay = 1;
-                       break;
-               case 'v':
-                       verify = 1;
-@@ -507,10 +502,8 @@ static int set_test_opt(char *optarg)
-                       use_async = 1;
-               } else if (!strncasecmp("block", optarg, 5)) {
-                       flags &= ~MSG_DONTWAIT;
--                      no_delay = 0;
-               } else if (!strncasecmp("nonblock", optarg, 8)) {
-                       flags |= MSG_DONTWAIT;
--                      no_delay = 1;
-               } else if (!strncasecmp("verify", optarg, 6)) {
-                       verify = 1;
-               } else {
+