refresh

diff --git a/meta b/meta
index 33789da9652464585b2f40e5e5f48266cab9c89c..0db8b521d38439063368dba0c6a54b97b37b7a99 100644 (file)
--- a/meta
+++ b/meta
@@ -1,9 +1,8 @@
 Version: 1
-Previous: 0b37a257b46c22946354b5a63507091afd85a5af
-Head: 8663ed6656ff9430bb35f3faf7e2d0f82a5da201
+Previous: 6fed80c4e352bc6d40ff8ff3c5ec2ab12b576f8c
+Head: 5070641f4e87250fd643f8d38b9bf8d45688499e
 Applied:
-  rs-iomap: 5a6fcf8af7162d16274556981d27be74f8a43295
-  refresh-temp: 8663ed6656ff9430bb35f3faf7e2d0f82a5da201
+  rs-iomap: 5070641f4e87250fd643f8d38b9bf8d45688499e
 Unapplied:
   riostream: 1ba9685f351cc59e13a02f4328cc78dbe00e0505
   iom-dbg: 88434072d07f8edc58f454ac954d78bd39441eed

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index c4e575d..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,22 +0,0 @@
-Bottom: 915e0ee4505ffa5dc789b46752172eee702adae3
-Top:    52637b17efade61815ce9a543e6ac319af39e10a
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2012-10-25 00:12:16 -0700
-
-Refresh of rs-iomap
-
----
-
-diff --git a/man/rsocket.7 b/man/rsocket.7
-index 5ecebc2..dc3f9ab 100644
---- a/man/rsocket.7
-+++ b/man/rsocket.7
-@@ -79,7 +79,7 @@ a receiver's view, riowrite transfers are silently redirected into a pre-
- determined data buffer.  Data is received automatically, and the receiver
- is not informed of the transfer.  However, iowrite data is still considered
- part of the data stream, such that iowrite data will be written before a
--subsequent transfer is received.  A  message sent immediately after initiating
-+subsequent transfer is received.  A message sent immediately after initiating
- an iowrite may be used to notify the receiver of the iowrite.
- .P
- In addition to standard socket options, rsockets supports options

diff --git a/patches/rs-iomap b/patches/rs-iomap
index 88af34698d83a39f7d2155b7f5c419e0b687b130..0beb50ccb5041dcc82b52c0bfd5769fa23d6be1c 100644 (file)
--- a/patches/rs-iomap
+++ b/patches/rs-iomap
@@ -1,5 +1,5 @@
 Bottom: daf53db464152f40dc8d6f2c99844510b03f8567
-Top:    915e0ee4505ffa5dc789b46752172eee702adae3
+Top:    52637b17efade61815ce9a543e6ac319af39e10a
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-10-21 14:16:03 -0700
 
@@ -204,7 +204,7 @@ index 65feda9..f220c13 100644
  }
  #endif
 diff --git a/man/rsocket.7 b/man/rsocket.7
-index 2ed5ca4..5ecebc2 100644
+index 2ed5ca4..dc3f9ab 100644
 --- a/man/rsocket.7
 +++ b/man/rsocket.7
 @@ -6,7 +6,7 @@ rsocket \- RDMA socket API
@@ -267,7 +267,7 @@ index 2ed5ca4..5ecebc2 100644
 +determined data buffer.  Data is received automatically, and the receiver
 +is not informed of the transfer.  However, iowrite data is still considered
 +part of the data stream, such that iowrite data will be written before a
-+subsequent transfer is received.  A  message sent immediately after initiating
++subsequent transfer is received.  A message sent immediately after initiating
 +an iowrite may be used to notify the receiver of the iowrite.
 +.P
  In addition to standard socket options, rsockets supports options