From 34390bfdfe0fcb5b49d4916185f2b0a280492d68 Mon Sep 17 00:00:00 2001
From: Sean Hefty <sean.hefty@intel.com>
Date: Thu, 25 Oct 2012 00:15:54 -0700
Subject: [PATCH] refresh

---
 meta                 |  7 +++----
 patches/refresh-temp | 24 ------------------------
 patches/riostream    | 17 ++++++++++++++++-
 3 files changed, 19 insertions(+), 29 deletions(-)
 delete mode 100644 patches/refresh-temp

diff --git a/meta b/meta
index eae9b128..3345e4fb 100644
--- a/meta
+++ b/meta
@@ -1,10 +1,9 @@
 Version: 1
-Previous: 45e8b6759e32c870f94f65185c14690c4d783913
-Head: f9e5716e072fc8fd86a41e776007fb7abff093e9
+Previous: 89dde950709ae30e1d02756ccdf1848eb2b1bd06
+Head: a1781cc64e41a1f62ec9a41999a40f8958196073
 Applied:
   rs-iomap: 5070641f4e87250fd643f8d38b9bf8d45688499e
-  riostream: 0e913c0fe1d112c2268e908dba8eaa8bcb4e7dd7
-  refresh-temp: f9e5716e072fc8fd86a41e776007fb7abff093e9
+  riostream: a1781cc64e41a1f62ec9a41999a40f8958196073
 Unapplied:
   iom-dbg: 88434072d07f8edc58f454ac954d78bd39441eed
   resv-rs-len: 7b6ff5c4894f54b221d877adcd709795dffb2fe9
diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644
index c825d473..00000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,24 +0,0 @@
-Bottom: 02615efe2058032a04219c5cd8d561302254e504
-Top:    f19a8b2ce69c643de5d0f18daa34e98ee942afed
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2012-10-25 00:15:54 -0700
-
-Refresh of riostream
-
----
-
-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
diff --git a/patches/riostream b/patches/riostream
index 1943e806..ba0235d8 100644
--- a/patches/riostream
+++ b/patches/riostream
@@ -1,5 +1,5 @@
 Bottom: 52637b17efade61815ce9a543e6ac319af39e10a
-Top:    02615efe2058032a04219c5cd8d561302254e504
+Top:    f19a8b2ce69c643de5d0f18daa34e98ee942afed
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-10-24 10:23:52 -0700
 
@@ -851,3 +851,18 @@ 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
-- 
2.41.0