refresh (create temporary patch)

diff --git a/meta b/meta
index b3c6e81dc913fda1248038005eebffeddf7d859d..3f793b2772cb529e32de1ee495470fcf3e3c70ca 100644 (file)
--- a/meta
+++ b/meta
@@ -1,8 +1,9 @@
 Version: 1
-Previous: 9e3391f9fc546b80fd08a03e19d7b12482c61bc7
-Head: d25c8115399392055d5c4fac68cc089a3d0cd330
+Previous: 28c2e8b721e3fdf1bfe99f3931432fe8f84c216b
+Head: 6122e024071f32c1ecf638eabe1cff5aee64c40b
 Applied:
   rs-iomap: d25c8115399392055d5c4fac68cc089a3d0cd330
+  refresh-temp: 6122e024071f32c1ecf638eabe1cff5aee64c40b
 Unapplied:
   riostream: dc6133820fa759fc0c480a6c01010037f6fde2c3
   resv-rs-len: 7b6ff5c4894f54b221d877adcd709795dffb2fe9

diff --git a/patches/refresh-temp b/patches/refresh-temp
new file mode 100644 (file)
index 0000000..f45902d
--- /dev/null
+++ b/patches/refresh-temp
@@ -0,0 +1,40 @@
+Bottom: 93fea4a0133ee9be5198c904501a510e1624c0d0
+Top:    056b8bfd424c0057063f61bff98567c021510bde
+Author: Sean Hefty <sean.hefty@intel.com>
+Date:   2012-10-24 15:16:45 -0700
+
+Refresh of rs-iomap
+
+---
+
+diff --git a/man/rsocket.7 b/man/rsocket.7
+index a1171fd..5ecebc2 100644
+--- a/man/rsocket.7
++++ b/man/rsocket.7
+@@ -47,7 +47,7 @@ This is also known as zero-copy support, since data is sent and
+ received directly, bypassing copies into network controlled buffers.
+ The following calls and options support direct data placement.
+ .P
+-riomap
++riomap, riounmap, riowrite
+ .TP
+ off_t riomap(int socket, void *buf, size_t len, int prot, int flags, off_t offset)
+ .TP
+@@ -91,6 +91,8 @@ RDMA_SQSIZE - Integer size of the underlying send queue.
+ RDMA_RQSIZE - Integer size of the underlying receive queue.
+ .TP
+ RDMA_INLINE - Integer size of inline data.
++.TP
++RDMA_IOMAPSIZE - Integer number of remote IO mappings supported
+ .P
+ Note that rsockets fd's cannot be passed into non-rsocket calls.  For
+ applications which must mix rsocket fd's with standard socket fd's or
+@@ -125,6 +127,8 @@ rqsize_default - default size of receive queue
+ .P
+ inline_default - default size of inline data
+ .P
++iomap_size - default size of remote iomapping table
++.P
+ If configuration files are not available, rsockets uses internal defaults.
+ .SH "SEE ALSO"
+ rdma_cm(7)