pop

diff --git a/meta b/meta
index 9b254a14f15aa517fb245cf9f1702529a8242f44..ec3ec52616528899a33682f27dcbfa7daed46ebd 100644 (file)
--- a/meta
+++ b/meta
@@ -1,10 +1,10 @@
 Version: 1
-Previous: 57fd197bbd80d1fcff150051d3d8c3d71c284c44
-Head: bb9fcba81acdfe34ea5df3bb23a45e0a486207da
+Previous: aa4b03ac5a9798b672bd783fa6bc70a1b8949080
+Head: 7d92d0106f50e0371256e74863963a0e2e99a5c8
 Applied:
   rs-iomap: bb9fcba81acdfe34ea5df3bb23a45e0a486207da
+  riostream: 7d92d0106f50e0371256e74863963a0e2e99a5c8
 Unapplied:
-  riostream: a1781cc64e41a1f62ec9a41999a40f8958196073
   iom-dbg: 88434072d07f8edc58f454ac954d78bd39441eed
   resv-rs-len: 7b6ff5c4894f54b221d877adcd709795dffb2fe9
   rs-target-sgl: 7a07c80f2242e80c076dcf3ec6bb4c94626b284f

diff --git a/patches/riostream b/patches/riostream
index ba0235d831d60b4ac0c661192867edbb51bea9f5..fe83fe7c13dbd0e6849cbb18dcb62a2fcf74f308 100644 (file)
--- a/patches/riostream
+++ b/patches/riostream
@@ -1,5 +1,5 @@
-Bottom: 52637b17efade61815ce9a543e6ac319af39e10a
-Top:    f19a8b2ce69c643de5d0f18daa34e98ee942afed
+Bottom: f577125f6a6e9da1cf989ea2c4e933c66a84cf05
+Top:    59dfa020a0be74bc45df6be3de00c8ca1f997348
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-10-24 10:23:52 -0700
 
@@ -851,18 +851,3 @@ index 0000000..14e77fa
 +libibverbs README file for additional details.
 +.SH "SEE ALSO"
 +rdma_cm(7) rstream(1)
-diff --git a/man/rsocket.7 b/man/rsocket.7
-index dc3f9ab..bc5bb10 100644
---- a/man/rsocket.7
-+++ b/man/rsocket.7
-@@ -7,8 +7,8 @@ rsocket \- RDMA socket API
- RDMA socket API and protocol
- .SH "NOTES"
- Rsockets is a protocol over RDMA that supports a socket-level API
--for applications.  rsocket APIs are intended to match the behavior
--of corresponding socket calls, except where noted.  rsocket
-+for applications.  Rsocket APIs are intended to match the behavior
-+of corresponding socket calls, except where noted.  Rsocket
- functions match the name and function signature of socket calls,
- with the exception that all function calls are prefixed with an 'r'.
- .P