refresh

diff --git a/meta b/meta
index 661120aec61ca9a768097793d70a330806ba351c..2ab71f1dcd6973811730e4575ab99705f5eb6ba7 100644 (file)
--- a/meta
+++ b/meta
@@ -1,9 +1,8 @@
 Version: 1
-Previous: dbb92d46afdc28b1f65f4f86417aafceb13c336e
-Head: c40a9de312f15ac14a0addcc7ca951c812eee2a3
+Previous: 150ba366ff4b09f3fdc6d431f931e87fb29a5648
+Head: dba7b4833fd1208813028483451d389cbeecf02a
 Applied:
-  rs-man: 9ba571f37e36c6f5d77c8e86caa410c927d4ab74
-  refresh-temp: c40a9de312f15ac14a0addcc7ca951c812eee2a3
+  rs-man: dba7b4833fd1208813028483451d389cbeecf02a
 Unapplied:
   rs-1sge: 10e5dd48bf6f4ccab00d5fafebec06b13110d5da
   ip6-opt: 7e43a759255e9890d1e41f1edf71792836f53941

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 55d07c9..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,28 +0,0 @@
-Bottom: 0926a4bf52b8e126ca0aa65bb38b16ed340e1515
-Top:    b2be28c058bcea1f57039dd4966c64ac692e6bfa
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2012-06-11 14:10:47 -0700
-
-Refresh of rs-man
-
----
-
-diff --git a/man/rsocket.7 b/man/rsocket.7
-index b26bab7..c6a2ad1 100644
---- a/man/rsocket.7
-+++ b/man/rsocket.7
-@@ -44,11 +44,11 @@ O_NONBLOCK
- In addition to standard socket options, rsockets supports options
- specific to RDMA devices and protocols.  These options are accessible
- through rsetsockopt using SOL_RDMA option level.
--.P
-+.TP
- RDMA_SQSIZE - Integer size of the underlying send queue.
--.P
-+.TP
- RDMA_RQSIZE - Integer size of the underlying receive queue.
--.P
-+.TP
- RDMA_INLINE - Integer size of inline data.
- .P
- Note that rsockets fd's cannot be passed into non-rsocket calls.  For

diff --git a/patches/rs-man b/patches/rs-man
index fa5ea2c82366371a4a399e09962639d4e861e898..c169fc5e109761e888d797097cbcc40678fee5b7 100644 (file)
--- a/patches/rs-man
+++ b/patches/rs-man
@@ -1,5 +1,5 @@
 Bottom: 19653040b4f6827e46b2b5079ab41e32a223fc76
-Top:    0926a4bf52b8e126ca0aa65bb38b16ed340e1515
+Top:    b2be28c058bcea1f57039dd4966c64ac692e6bfa
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-06-11 13:20:18 -0700
 
@@ -26,7 +26,7 @@ index 1dc61e1..51b2f89 100644
        librdmacm.spec.in $(man_MANS)
 diff --git a/man/rsocket.7 b/man/rsocket.7
 new file mode 100644
-index 0000000..b26bab7
+index 0000000..c6a2ad1
 --- /dev/null
 +++ b/man/rsocket.7
 @@ -0,0 +1,82 @@
@@ -76,11 +76,11 @@ index 0000000..b26bab7
 +In addition to standard socket options, rsockets supports options
 +specific to RDMA devices and protocols.  These options are accessible
 +through rsetsockopt using SOL_RDMA option level.
-+.P
++.TP
 +RDMA_SQSIZE - Integer size of the underlying send queue.
-+.P
++.TP
 +RDMA_RQSIZE - Integer size of the underlying receive queue.
-+.P
++.TP
 +RDMA_INLINE - Integer size of inline data.
 +.P
 +Note that rsockets fd's cannot be passed into non-rsocket calls.  For