refresh

diff --git a/meta b/meta
index bb2177cd4d70aa67483e8866727856a16443496a..f89566f3b910e9726c93031829231c5c878ac1f2 100644 (file)
--- a/meta
+++ b/meta
@@ -1,9 +1,8 @@
 Version: 1
-Previous: 5deedbb776721794c6f6a028b0060b7153f9cc73
-Head: f3369a2e3980a754c120c84655be4d6f6731799e
+Previous: 106817b630d19e944f2ad1b19b8891bd42782ebc
+Head: 1f6088f85af3c60ba4d57de1d8f1098e06761237
 Applied:
-  doc-poll-time: 8d30d65a90fef135ae2abe773e656cc934771feb
-  refresh-temp: f3369a2e3980a754c120c84655be4d6f6731799e
+  doc-poll-time: 1f6088f85af3c60ba4d57de1d8f1098e06761237
 Unapplied:
   af-ib-conn: 703ed114b9a72ec637838cbbb761cf380f849c13
   addrtype: 78ab6dcea90cc315ed43b84c466290adcf3e224d

diff --git a/patches/doc-poll-time b/patches/doc-poll-time
index 97fa880080e57a938dd9f09d348d826b490732df..088e8e7074628bf2265786d45387c1e882b7376e 100644 (file)
--- a/patches/doc-poll-time
+++ b/patches/doc-poll-time
@@ -1,9 +1,12 @@
 Bottom: 87aac2094972e0392ac4742a2c54ba76c2f5747a
-Top:    46d2c09b14ffdd019ea7f40457e85e20b4dc1fa2
+Top:    251ce87c0cff93e0365c1bd08504d77240b0f0c8
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2013-01-21 15:28:39 -0800
 
-rsockets: Document polling_time configuration file
+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>
 
@@ -11,10 +14,37 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 ---
 
 diff --git a/man/rsocket.7 b/man/rsocket.7
-index bc5bb10..7b49e46 100644
+index bc5bb10..9cc33f5 100644
 --- a/man/rsocket.7
 +++ b/man/rsocket.7
-@@ -129,6 +129,15 @@ inline_default - default size of inline data
+@@ -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

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 5b585d2..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,40 +0,0 @@
-Bottom: 46d2c09b14ffdd019ea7f40457e85e20b4dc1fa2
-Top:    251ce87c0cff93e0365c1bd08504d77240b0f0c8
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2013-01-21 15:47:23 -0800
-
-Refresh of doc-poll-time
-
----
-
-diff --git a/man/rsocket.7 b/man/rsocket.7
-index 7b49e46..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.