import

diff --git a/meta b/meta
index a910c486e6fe16870be46560e1c9ce6baacb6b9a..074286fe3b711cb0b41dda9ed013a713b5e9924e 100644 (file)
--- a/meta
+++ b/meta
@@ -1,7 +1,9 @@
 Version: 1
-Previous: da2be12735b67a54bfa27579a63c3dae28adc97b
-Head: 86520b86ffb45d3caf6e5bd94271f99deef0a5f9
+Previous: 0b8cd356a141074056d2d55d81a8082bec6853c9
+Head: 1f013fbdc9963b6fd17af42c99b093b3beb8d928
 Applied:
+  librdmacm-makefile-am-add-miss: 4d62c32794313aadd188b81e1ae2333582d6b923
+  librdmacm-some-fixes-to-man-pa: 1f013fbdc9963b6fd17af42c99b093b3beb8d928
 Unapplied:
   old-af-ib: d71ebf70cf74111cfd5f0982d9abe6ec68fb38e3
   old-seterr: 47eb0c419687c2690292c1910acae83a46e5388c

diff --git a/patches/librdmacm-makefile-am-add-miss b/patches/librdmacm-makefile-am-add-miss
new file mode 100644 (file)
index 0000000..d7bbf1b
--- /dev/null
+++ b/patches/librdmacm-makefile-am-add-miss
@@ -0,0 +1,24 @@
+Bottom: 75b04ca01637eeac4f5b673a12c87917a9126271
+Top:    29f7286704569501e768c26716f57dc0a244e23d
+Author: Hal Rosenstock <hal@dev.mellanox.co.il>
+Date:   2013-11-04 07:56:08 -0500
+
+[librdmacm] Makefile.am: Add missing riostream man page to man_MANS
+
+Signed-off-by: Hal Rosenstock <hal@mellanox.com>
+
+
+---
+
+diff --git a/Makefile.am b/Makefile.am
+index 4e3dee7..bf72134 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -125,6 +125,7 @@ man_MANS = \
+       man/rdma_client.1 \
+       man/rdma_xserver.1 \
+       man/rdma_xclient.1 \
++      man/riostream.1 \
+       man/rstream.1 \
+       man/rcopy.1 \
+       man/rdma_cm.7 \

diff --git a/patches/librdmacm-some-fixes-to-man-pa b/patches/librdmacm-some-fixes-to-man-pa
new file mode 100644 (file)
index 0000000..181afbe
--- /dev/null
+++ b/patches/librdmacm-some-fixes-to-man-pa
@@ -0,0 +1,48 @@
+Bottom: 29f7286704569501e768c26716f57dc0a244e23d
+Top:    45950061e96f3725b666bbe4061f648f52898e90
+Author: Guy Shapiro <guysh@mellanox.com>
+Date:   2013-11-05 19:52:20 +0200
+
+librdmacm: Some fixes to man pages
+
+Fix the man pages of rdma_destroy_ep & rdma_destroy_qp to the correct return value (void).
+
+
+---
+
+diff --git a/man/rdma_destroy_ep.3 b/man/rdma_destroy_ep.3
+index b48a1e5..750702a 100644
+--- a/man/rdma_destroy_ep.3
++++ b/man/rdma_destroy_ep.3
+@@ -5,16 +5,13 @@ rdma_destroy_ep \- Release a communication identifier.
+ .SH SYNOPSIS
+ .B "#include <rdma/rdma_cma.h>"
+ .P
+-.B "int" rdma_destroy_ep
++.B "void" rdma_destroy_ep
+ .BI "(struct rdma_cm_id *" id ");"
+ .SH ARGUMENTS
+ .IP "id" 12
+ The communication identifier to destroy.
+ .SH "DESCRIPTION"
+ Destroys the specified rdma_cm_id and all associated resources
+-.SH "RETURN VALUE"
+-Returns 0 on success, or -1 on error.  If an error occurs, errno will be
+-set to indicate the failure reason.
+ .SH "NOTES"
+ rdma_destroy_ep will automatically destroy any QP and SRQ associated with
+ the rdma_cm_id.
+diff --git a/man/rdma_destroy_qp.3 b/man/rdma_destroy_qp.3
+index aeff667..bb1360e 100644
+--- a/man/rdma_destroy_qp.3
++++ b/man/rdma_destroy_qp.3
+@@ -11,9 +11,6 @@ rdma_destroy_qp \- Deallocate a QP.
+ RDMA identifier.
+ .SH "DESCRIPTION"
+ Destroy a QP allocated on the rdma_cm_id.
+-.SH "RETURN VALUE"
+-Returns 0 on success, or -1 on error.  If an error occurs, errno will be
+-set to indicate the failure reason.
+ .SH "NOTES"
+ Users must destroy any QP associated with an rdma_cm_id before
+ destroying the ID.