refresh

diff --git a/meta b/meta
index 3356d144de7c13a2f9be3d22bc3c701ed1e39e87..41a4abd83bf48b3dead1a75d88edae270acc71d1 100644 (file)
--- a/meta
+++ b/meta
@@ -1,9 +1,8 @@
 Version: 1
-Previous: 90957086dd7685edbb1d1b11d0d8b78cbf664afe
-Head: f6e38e0dcde750b12b87d783492f390f9c5da0af
+Previous: 11031aae95b8cde22b44d49d93c6f223b674e5a8
+Head: f7f2fc66d5cda4b70df376995a22b3ed4c4ac0de
 Applied:
-  dbg-fork: 80f787d351c57e6d7a54d49370b4e02eefaa542a
-  refresh-temp: f6e38e0dcde750b12b87d783492f390f9c5da0af
+  dbg-fork: f7f2fc66d5cda4b70df376995a22b3ed4c4ac0de
 Unapplied:
   af_ib: 2e4bfa467343c57c68616c1922c01765df3ed1db
   dbg-out: 4b4c0572eab77856d8fbb919b1feb8f3502a101a

diff --git a/patches/dbg-fork b/patches/dbg-fork
index 7fb7ad85fc39d734065805c5aa4f730c5f709afa..db8abe54c771064caf348e2f2c2cba4a4e9e2893 100644 (file)
--- a/patches/dbg-fork
+++ b/patches/dbg-fork
@@ -1,5 +1,5 @@
 Bottom: 30191aa638f3f574e67a71c82fa7771bcc620c52
-Top:    06853a301391158299c28be6011861e4de091813
+Top:    d21d7a185654b30280c213c38688f30ca0fabe87
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-08-21 13:49:59 -0700
 
@@ -9,9 +9,18 @@ debug fork issue
 ---
 
 diff --git a/src/preload.c b/src/preload.c
-index 0645f6d..c96d1d7 100644
+index 0645f6d..8889410 100644
 --- a/src/preload.c
 +++ b/src/preload.c
+@@ -239,7 +239,7 @@ void getenv_options(void)
+       if (var)
+               sq_inline = atoi(var);
+ 
+-      var = getenv("RDMAV_FORK_SAFE");
++      var = getenv("RS_FORK_SUPPORT");
+       if (var)
+               fork_support = atoi(var);
+ }
 @@ -413,11 +413,13 @@ int socket(int domain, int type, int protocol)
                return index;
  

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 11af2a1..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,22 +0,0 @@
-Bottom: 06853a301391158299c28be6011861e4de091813
-Top:    d21d7a185654b30280c213c38688f30ca0fabe87
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2012-08-22 14:33:18 -0700
-
-Refresh of dbg-fork
-
----
-
-diff --git a/src/preload.c b/src/preload.c
-index c96d1d7..8889410 100644
---- a/src/preload.c
-+++ b/src/preload.c
-@@ -239,7 +239,7 @@ void getenv_options(void)
-       if (var)
-               sq_inline = atoi(var);
- 
--      var = getenv("RDMAV_FORK_SAFE");
-+      var = getenv("RS_FORK_SUPPORT");
-       if (var)
-               fork_support = atoi(var);
- }