refresh

diff --git a/meta b/meta
index f33b815cec8d9cd1ae8aeafa4467ce747a755ca0..4c658ace4846c3b3b652fa1d1710802f1712b887 100644 (file)
--- a/meta
+++ b/meta
@@ -1,9 +1,8 @@
 Version: 1
-Previous: ce1c1f1f545410834ba584ac9398c9493c9d0741
-Head: db8291fff6ea42d2d3e3eeb49286cdca3e09390a
+Previous: 4b20f1fdc9e3a1a4d45d80eda483e0fec3f4cf38
+Head: 4c834bc154a73e7edd6dd4a912933958ca142d8d
 Applied:
-  transpose: 71e126e4a152d09c6270bb38696d5cc846d00cf5
-  refresh-temp: db8291fff6ea42d2d3e3eeb49286cdca3e09390a
+  transpose: 4c834bc154a73e7edd6dd4a912933958ca142d8d
 Unapplied:
   fork: d62b389a7f30187f39e8c6ae709fbdbf8423e7e8
   waitall-buggy: c49c6b56c55385774065f5aa2704078e6ae0ceb8

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index f35577d..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,26 +0,0 @@
-Bottom: 11bc8abd7626b80e35f4275314327e7ddf07c950
-Top:    454cf9a1db769bb4bf7d2c1d4b95f0a992a0aafa
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2012-07-16 14:30:19 -0700
-
-Refresh of transpose
-
----
-
-diff --git a/src/preload.c b/src/preload.c
-index cc0d7eb..0d457bf 100644
---- a/src/preload.c
-+++ b/src/preload.c
-@@ -252,9 +252,9 @@ out:
- }
- 
- /*
-- * Convert between an rsocket and a normal socket.  The new socket should have the
-- * same settings and bindings as the current socket.  We currently only handle
-- * setting a few of the more common values.
-+ * Convert between an rsocket and a normal socket.  The new socket should have
-+ * the same settings and bindings as the current socket.  We currently only
-+ * handle setting a few of the more common values.
-  */
- static int
- transpose_socket(int index, int *fd, enum fd_type new_type,

diff --git a/patches/transpose b/patches/transpose
index bea1048a5912ae5b2522b0963263535902eac595..eac9025db85e2e260ecb2e90f037616aaad3687f 100644 (file)
--- a/patches/transpose
+++ b/patches/transpose
@@ -1,5 +1,5 @@
 Bottom: 7ec243f3149e9a1ff1d5183f18e30d2458e354d6
-Top:    11bc8abd7626b80e35f4275314327e7ddf07c950
+Top:    454cf9a1db769bb4bf7d2c1d4b95f0a992a0aafa
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-07-16 14:17:58 -0700
 
@@ -17,7 +17,7 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 ---
 
 diff --git a/src/preload.c b/src/preload.c
-index 2750b30..cc0d7eb 100644
+index 2750b30..0d457bf 100644
 --- a/src/preload.c
 +++ b/src/preload.c
 @@ -252,51 +252,63 @@ out:
@@ -27,9 +27,9 @@ index 2750b30..cc0d7eb 100644
 - * Convert from an rsocket to a normal socket.  The new socket should have the
 - * same settings and bindings as the rsocket.  We currently only handle setting
 - * a few of the more common values.
-+ * Convert between an rsocket and a normal socket.  The new socket should have the
-+ * same settings and bindings as the current socket.  We currently only handle
-+ * setting a few of the more common values.
++ * Convert between an rsocket and a normal socket.  The new socket should have
++ * the same settings and bindings as the current socket.  We currently only
++ * handle setting a few of the more common values.
   */
 -static int socket_fallback(int socket, int *fd)
 +static int