refresh (create temporary patch)

diff --git a/meta b/meta
index ce5bfa9034610175cf12ef3cde7cdd7e9119b0c5..c8d8a1a70bd7c7a70bcccebaab8d4b3a2b2dfa22 100644 (file)
--- a/meta
+++ b/meta
@@ -1,8 +1,9 @@
 Version: 1
-Previous: 2396e84585291ad143708dd230bad38c6eca0981
-Head: f723a5833783171cc318f615202658bf75de4141
+Previous: b3c54950abc9b93a1d0f2eba532f9cf98b101b5c
+Head: 0430ca648991c4f931a642d7303097df84d7be03
 Applied:
   doc-fork: f723a5833783171cc318f615202658bf75de4141
+  refresh-temp: 0430ca648991c4f931a642d7303097df84d7be03
 Unapplied:
   shutdown: 8c9557c0aa6cddf2d56a57e289d136c75d40e2b2
   old-af-ib: d71ebf70cf74111cfd5f0982d9abe6ec68fb38e3

diff --git a/patches/refresh-temp b/patches/refresh-temp
new file mode 100644 (file)
index 0000000..109c3ba
--- /dev/null
+++ b/patches/refresh-temp
@@ -0,0 +1,36 @@
+Bottom: 085f7c15662b316080106da090760de1b5abe8c5
+Top:    ffbbb287b1a2e4fbdbcedb90103f988acb8fcb42
+Author: Sean Hefty <sean.hefty@intel.com>
+Date:   2013-08-22 15:36:33 -0700
+
+Refresh of doc-fork
+
+---
+
+diff --git a/man/rsocket.7 b/man/rsocket.7
+index 9cc33f5..9a55887 100644
+--- a/man/rsocket.7
++++ b/man/rsocket.7
+@@ -96,6 +96,8 @@ RDMA_RQSIZE - Integer size of the underlying receive queue.
+ RDMA_INLINE - Integer size of inline data.
+ .TP
+ RDMA_IOMAPSIZE - Integer number of remote IO mappings supported
++.TP
++RDMA_ROUTE - struct ibv_path_data of path record for connection.
+ .P
+ Note that rsockets fd's cannot be passed into non-rsocket calls.  For
+ applications which must mix rsocket fd's with standard socket fd's or
+@@ -113,7 +115,12 @@ subdirectory.
+ The preload library can be used by setting LD_PRELOAD when running.
+ Note that not all applications will work with rsockets.  Support is
+ limited based on the socket options used by the application.
+-Additionally, applications which call fork are not supported.
++Support for fork() is limited, but available.  To use rsockets with
++the preload library for applications that call fork, users must
++set the environment variable RDMAV_FORK_SAFE=1 on both the client
++and server side of the connection.  In general, fork is
++supportable for server applications that accept a connection, then
++fork off a process to handle the new connection.
+ .P
+ rsockets uses configuration files that give an administrator control
+ over the default settings used by rsockets.  Use files under