From: Sean Hefty <sean.hefty@intel.com>
Date: Fri, 11 May 2012 17:49:19 +0000 (-0700)
Subject: refresh
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=c12f8f9fc721a05b0cdd40b5d4916230b7760ac5;p=~shefty%2Flibrdmacm.git

refresh
---

diff --git a/meta b/meta
index 1600772d..a11b9a32 100644
--- a/meta
+++ b/meta
@@ -1,11 +1,10 @@
 Version: 1
-Previous: 926e1aa4c75cbe015241b63902036eb3a476efd8
-Head: 3a852ae6ae16cf7b60ad793c5963708c3a0c5ef8
+Previous: 894c1096feffdb35cd10b21c991dbf444c846d1b
+Head: 8f0437ec677c4752126de8667e093667dd681d56
 Applied:
   rs-locking: ec6a8efe211b0dc98548443c2e0d67e2c355351f
   reuseaddr: 5ce7d9c48d082fd1959918e9134f4bdd85c402d9
-  rstream-delay: b60d0c8781b920fad52ac3fb63264ea538cf226a
-  refresh-temp: 3a852ae6ae16cf7b60ad793c5963708c3a0c5ef8
+  rstream-delay: 8f0437ec677c4752126de8667e093667dd681d56
 Unapplied:
   rstream-async-opt: 05b2741e5c346be2ed80a63d3213487f2b2f808c
   comp_locks: b89aab130b4619806557e11e6b9c10964f00743f
diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644
index 367d13a8..00000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,22 +0,0 @@
-Bottom: e158cfb023f019d4ef91f72e39f049c35cf5993e
-Top:    1e3526d39b2591bb10a08bfed2622f05f82b1bd8
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2012-05-11 10:49:19 -0700
-
-Refresh of rstream-delay
-
----
-
-diff --git a/examples/rstream.c b/examples/rstream.c
-index a52a262..7f39b29 100644
---- a/examples/rstream.c
-+++ b/examples/rstream.c
-@@ -56,7 +56,7 @@ static int test_size[] = {
- static int use_rs = 1;
- static int use_async;
- static int verify;
--static int flags;
-+static int flags = MSG_DONTWAIT;
- static int no_delay = 1;
- static int custom;
- static int iterations = 1;
diff --git a/patches/rstream-delay b/patches/rstream-delay
index 3a4d2175..e21a1f36 100644
--- a/patches/rstream-delay
+++ b/patches/rstream-delay
@@ -1,5 +1,5 @@
 Bottom: ea75b8334003947a7f09ba5f0efcec267b5143c1
-Top:    e158cfb023f019d4ef91f72e39f049c35cf5993e
+Top:    1e3526d39b2591bb10a08bfed2622f05f82b1bd8
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-05-11 10:33:13 -0700
 
@@ -19,14 +19,16 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 ---
 
 diff --git a/examples/rstream.c b/examples/rstream.c
-index 8aa089d..a52a262 100644
+index 8aa089d..7f39b29 100644
 --- a/examples/rstream.c
 +++ b/examples/rstream.c
-@@ -57,7 +57,7 @@ static int use_rs = 1;
+@@ -56,8 +56,8 @@ static int test_size[] = {
+ static int use_rs = 1;
  static int use_async;
  static int verify;
- static int flags;
+-static int flags;
 -static int no_delay;
++static int flags = MSG_DONTWAIT;
 +static int no_delay = 1;
  static int custom;
  static int iterations = 1;