refresh (create temporary patch)

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

diff --git a/patches/refresh-temp b/patches/refresh-temp
new file mode 100644 (file)
index 0000000..f35577d
--- /dev/null
+++ b/patches/refresh-temp
@@ -0,0 +1,26 @@
+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,