commit

diff --git a/meta b/meta
index 85e0799296d90bd6d2cd73ad1279b08c8b7b783b..cdf6c491fe04b8bdef070d7f4fac8ea3b29d1ac5 100644 (file)
--- a/meta
+++ b/meta
@@ -1,8 +1,7 @@
 Version: 1
-Previous: 98aa2826223d5dde949f8f9bea6f832f5fcc7e1f
+Previous: 4b24ad46b83729c91175d37b9a244baddb057beb
 Head: 18a001ac3215de7a860231007aa2d57058ed1735
 Applied:
-  doc-rspre: 5e8b63a53951f7fbec61acfb1b5a494b39d56487
   v1-0-16: 18a001ac3215de7a860231007aa2d57058ed1735
 Unapplied:
   waitall-buggy: c49c6b56c55385774065f5aa2704078e6ae0ceb8

diff --git a/patches/doc-rspre b/patches/doc-rspre
deleted file mode 100644 (file)
index 0a38fa6..0000000
--- a/patches/doc-rspre
+++ /dev/null
@@ -1,34 +0,0 @@
-Bottom: 31af2c38b30cc7004b87c3d8c3adf4afc84f8df4
-Top:    b0d26700067fa09254ee8df365690f91fd2ac5fb
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2012-07-11 15:13:29 -0700
-
-rspreload: Document use of librspreload library
-
-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