commit

diff --git a/meta b/meta
index f89566f3b910e9726c93031829231c5c878ac1f2..d8e9360859b3edfe34deb7e3810e3ce71f726b00 100644 (file)
--- a/meta
+++ b/meta
@@ -1,8 +1,7 @@
 Version: 1
-Previous: 106817b630d19e944f2ad1b19b8891bd42782ebc
+Previous: a345858448914d33202a48998767a0a206b80464
 Head: 1f6088f85af3c60ba4d57de1d8f1098e06761237
 Applied:
-  doc-poll-time: 1f6088f85af3c60ba4d57de1d8f1098e06761237
 Unapplied:
   af-ib-conn: 703ed114b9a72ec637838cbbb761cf380f849c13
   addrtype: 78ab6dcea90cc315ed43b84c466290adcf3e224d

diff --git a/patches/doc-poll-time b/patches/doc-poll-time
deleted file mode 100644 (file)
index 088e8e7..0000000
--- a/patches/doc-poll-time
+++ /dev/null
@@ -1,62 +0,0 @@
-Bottom: 87aac2094972e0392ac4742a2c54ba76c2f5747a
-Top:    251ce87c0cff93e0365c1bd08504d77240b0f0c8
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2013-01-21 15:28:39 -0800
-
-rsockets: Update rsocket man page
-
-Update man page to include recently added rsocket options
-and undocumented configuration file.
-
-Signed-off-by: Sean Hefty <sean.hefty@intel.com>
-
-
----
-
-diff --git a/man/rsocket.7 b/man/rsocket.7
-index bc5bb10..9cc33f5 100644
---- a/man/rsocket.7
-+++ b/man/rsocket.7
-@@ -1,4 +1,4 @@
--.TH "RSOCKET" 7 "2010-07-19" "librdmacm" "Librdmacm Programmer's Manual" librdmacm
-+.TH "RSOCKET" 7 "2013-01-21" "librdmacm" "Librdmacm Programmer's Manual" librdmacm
- .SH NAME
- rsocket \- RDMA socket API
- .SH SYNOPSIS
-@@ -33,13 +33,16 @@ rsetsockopt, rgetsockopt, rfcntl
- Functions take the same parameters as that used for sockets.  The
- follow capabilities and flags are supported at this time:
- .P
--PF_INET, PF_INET6, SOCK_STREAM, IPPROTO_TCP, TCP_MAXSEG
-+PF_INET, PF_INET6, SOCK_STREAM, SOCK_DGRAM
- .P
--MSG_DONTWAIT, MSG_PEEK
-+SOL_SOCKET - SO_ERROR, SO_KEEPALIVE (flag supported, but ignored),
-+SO_LINGER, SO_OOBINLINE, SO_RCVBUF, SO_REUSEADDR, SO_SNDBUF
-+.P 
-+IPPROTO_TCP - TCP_NODELAY, TCP_MAXSEG
- .P
--SO_REUSEADDR, TCP_NODELAY, SO_ERROR, SO_SNDBUF, SO_RCVBUF
-+IPPROTO_IPV6 - IPV6_V6ONLY
- .P
--O_NONBLOCK
-+MSG_DONTWAIT, MSG_PEEK, O_NONBLOCK
- .P
- Rsockets provides extensions beyond normal socket routines that
- allow for direct placement of data into an application's buffer.
-@@ -129,6 +132,15 @@ inline_default - default size of inline data
- .P
- iomap_size - default size of remote iomapping table
- .P
-+polling_time - default number of microseconds to poll for data before waiting
-+.P
-+All configuration files should contain a single integer value.  Values may
-+be set by issuing a command similar to the following example.
-+.P
-+echo 1000000 > /etc/rdma/rsocket/mem_default
-+.P
- If configuration files are not available, rsockets uses internal defaults.
-+Applications can override default values programmatically through the
-+rsetsockopt routine.
- .SH "SEE ALSO"
- rdma_cm(7)