commit

diff --git a/meta b/meta
index ffce7090201b6c32ba0b1884ecdf3d7882e39a66..ff92c3969195afbf2a4a228d548c42c8091f6e94 100644 (file)
--- a/meta
+++ b/meta
@@ -1,8 +1,7 @@
 Version: 1
-Previous: 23e98eef4bf74429a7e5b6c4256316e177095f47
+Previous: aa884f585c33e60075f0e5afb8471619caba3444
 Head: d2e96e99bf1fc3d14e33c741502cb689c810a27b
 Applied:
-  rdma_xserver-client-fix-man-pa: d2e96e99bf1fc3d14e33c741502cb689c810a27b
 Unapplied:
   af-ib-conn: 70cdbcec6986d1fcc8146a73cf2d8b6a537e71f5
   addrtype: fffb812c9cbe707f830d1e7e713feb3ae3e2e8ec

diff --git a/patches/rdma_xserver-client-fix-man-pa b/patches/rdma_xserver-client-fix-man-pa
deleted file mode 100644 (file)
index 4599701..0000000
--- a/patches/rdma_xserver-client-fix-man-pa
+++ /dev/null
@@ -1,58 +0,0 @@
-Bottom: 7c7253fbda963ab279336f08306bfb987ff84d79
-Top:    daf53db464152f40dc8d6f2c99844510b03f8567
-Author: Roland Dreier <roland@purestorage.com>
-Date:   2012-10-16 19:44:39 +0000
-
-rdma_xserver/client: Fix man page formatting
-
-Putting 'r' at the beginning of a line in the nroff source for man pages
-is confusing to nroff because lines that start with a single quote
-character ' or a dot character . are treated as control lines, which is
-not what's intended here.  Some of the man page text ends up left out of
-the formatted output.
-
-Fix this by just wrapping the text slightly differently in the source
-(which doesn't matter since nroff reflows the text anyway).  Also add a
-missing ".TP" so that the -p and -c options are not run together in the
-formatted output.
-
-Signed-off-by: Roland Dreier <roland@purestorage.com>
-Signed-off-by: Sean Hefty <sean.hefty@intel.com>
-
-
----
-
-diff --git a/man/rdma_xclient.1 b/man/rdma_xclient.1
-index 087e7fe..b4bb045 100644
---- a/man/rdma_xclient.1
-+++ b/man/rdma_xclient.1
-@@ -20,9 +20,10 @@ By default, the client will attempt to connect to the server using
- \-p server_port
- Specifies the port number that the server listens on.  By default the server
- listens on port 7471.
-+.TP
- \-c communication type
--Specifies the type of communication established with the server program.
--'r' results in using a reliable-connected QP (the default).  'x' uses
-+Specifies the type of communication established with the server program.  'r'
-+results in using a reliable-connected QP (the default).  'x' uses
- extended reliable-connected XRC QPs.
- .SH "NOTES"
- Basic usage is to start rdma_xserver, then connect to the server using the
-diff --git a/man/rdma_xserver.1 b/man/rdma_xserver.1
-index 75529e4..a26c962 100644
---- a/man/rdma_xserver.1
-+++ b/man/rdma_xserver.1
-@@ -14,9 +14,10 @@ data.
- \-p port
- Changes the port number that the server listens on.  By default the server
- listens on port 7471.
-+.TP
- \-c communication type
--Specifies the type of communication established with the client program.
--'r' results in using a reliable-connected QP (the default).  'x' uses
-+Specifies the type of communication established with the client program.  'r'
-+results in using a reliable-connected QP (the default).  'x' uses
- extended reliable-connected XRC QPs.
- .SH "NOTES"
- Basic usage is to start rdma_xserver, then connect to the server using the