refresh

diff --git a/meta b/meta
index f8e012205d58e67adf1248e2f1861ce82dbb615b..5bc7f1e48cfa29a2431c8bcc1d925d28b160b55c 100644 (file)
--- a/meta
+++ b/meta
@@ -1,9 +1,8 @@
 Version: 1
-Previous: 681b1e6a00e07f82defaa388cc002fc9b0ebc228
-Head: 1780ee70d66c99d6c9f7e6a7f86ff13cb2b1296d
+Previous: b37c803247ae2e6765f786cf336af488ee90dae0
+Head: 5e8b63a53951f7fbec61acfb1b5a494b39d56487
 Applied:
-  doc-rspre: 08c9369e7c21ac1f63999a19b9ef4308268a0ec5
-  refresh-temp-0: 1780ee70d66c99d6c9f7e6a7f86ff13cb2b1296d
+  doc-rspre: 5e8b63a53951f7fbec61acfb1b5a494b39d56487
 Unapplied:
   v1-0-16: e438f45a787a430edf943a741886b009737c032a
   waitall-buggy: c49c6b56c55385774065f5aa2704078e6ae0ceb8

diff --git a/patches/doc-rspre b/patches/doc-rspre
index 137d1b2020196c5f218a8d97f1be15ba832de73e..0a38fa6973193703072f34e3f1b9e57b00fc3ca1 100644 (file)
--- a/patches/doc-rspre
+++ b/patches/doc-rspre
@@ -1,5 +1,5 @@
 Bottom: 31af2c38b30cc7004b87c3d8c3adf4afc84f8df4
-Top:    31af2c38b30cc7004b87c3d8c3adf4afc84f8df4
+Top:    b0d26700067fa09254ee8df365690f91fd2ac5fb
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-07-11 15:13:29 -0700
 
@@ -10,4 +10,25 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 
 ---
 
-
+diff --git a/man/rsocket.7 b/man/rsocket.7
+index c6a2ad1..2ed5ca4 100644
+--- a/man/rsocket.7
++++ b/man/rsocket.7
+@@ -59,8 +59,15 @@ normal fd's.
+ Existing applications can make use of rsockets through the use of a
+ preload library.  Because rsockets implements an end-to-end protocol,
+ both sides of a connection must use rsockets.  The rdma_cm library
+-provides such a preload library.  See the librdmacm documentation for
+-more details.
++provides such a preload library, librspreload.  To reduce the chance
++of the preload library intercepting calls without the user's explicit
++knowledge, the librspreload library is installed into %libdir%/rsocket
++subdirectory.
++.P
++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.
+ .P
+ rsockets uses configuration files that give an administrator control
+ over the default settings used by rsockets.  Use files under

diff --git a/patches/refresh-temp-0 b/patches/refresh-temp-0
deleted file mode 100644 (file)
index 6045f77..0000000
--- a/patches/refresh-temp-0
+++ /dev/null
@@ -1,31 +0,0 @@
-Bottom: 31af2c38b30cc7004b87c3d8c3adf4afc84f8df4
-Top:    b0d26700067fa09254ee8df365690f91fd2ac5fb
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2012-07-11 15:26:08 -0700
-
-Refresh of doc-rspre
-
----
-
-diff --git a/man/rsocket.7 b/man/rsocket.7
-index c6a2ad1..2ed5ca4 100644
---- a/man/rsocket.7
-+++ b/man/rsocket.7
-@@ -59,8 +59,15 @@ normal fd's.
- Existing applications can make use of rsockets through the use of a
- preload library.  Because rsockets implements an end-to-end protocol,
- both sides of a connection must use rsockets.  The rdma_cm library
--provides such a preload library.  See the librdmacm documentation for
--more details.
-+provides such a preload library, librspreload.  To reduce the chance
-+of the preload library intercepting calls without the user's explicit
-+knowledge, the librspreload library is installed into %libdir%/rsocket
-+subdirectory.
-+.P
-+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.
- .P
- rsockets uses configuration files that give an administrator control
- over the default settings used by rsockets.  Use files under