refresh

diff --git a/meta b/meta
index d2efffc1de0df0c14ed1f5d7f484c939ba8e24da..c42c90588922de1285a1a78d97a45429937535c8 100644 (file)
--- a/meta
+++ b/meta
@@ -1,11 +1,10 @@
 Version: 1
-Previous: 78f4e55801e29a5daed16a60ffe0df707df2f56d
-Head: 729fff4c4b8a9b39f192f4e3a726d615946fa4bc
+Previous: ff9969c4883aa4da01ae52ee4d111751b043161b
+Head: 6fe19c8ba560c3aa57c25ba8ffa0602e7b7c6786
 Applied:
   cma-rm-pd: 2ffda7f2991395570b9e776ff5ae256ca9684771
   transpose: 3e52eb22f44eafaefa95c4674bc5665a94e15694
-  fork: e4a127d51d3f9de2dff53942ab63987b3f236549
-  refresh-temp: 729fff4c4b8a9b39f192f4e3a726d615946fa4bc
+  fork: 6fe19c8ba560c3aa57c25ba8ffa0602e7b7c6786
 Unapplied:
   rstream-fork: e968946ba3b1b6f18b00c54621068ba3996362df
   init-getname: 0b5ff94aacdd00d2a3e8a8a548249d43c88dc719

diff --git a/patches/fork b/patches/fork
index c54f6bcf8f36b4f6e601eca5e2f647725aa6db34..22c309a7c64740b4f15b39be7d494dc9d15cc520 100644 (file)
--- a/patches/fork
+++ b/patches/fork
@@ -13,7 +13,7 @@ recv, read, write, etc.).
 
 Fork support is indicated by setting the environment variable
 RDMAV_FORK_SAFE = 1.  When set, the preload library will delay
-converting to an rsocket until the user attemts to send or receive
+converting to an rsocket until the user attempts to send or receive
 data on the socket.  To convert from a normal socket to an
 rsocket, the preload library must inject a message on the
 normal socket to synchronize between the client and server.  As

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 9d75839..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,10 +0,0 @@
-Bottom: 04a586373bea04b3e94c31fe01c365a50b7c1bf1
-Top:    04a586373bea04b3e94c31fe01c365a50b7c1bf1
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2012-07-24 15:28:47 -0700
-
-Refresh of fork
-
----
-
-