pop

diff --git a/meta b/meta
index 1ca8c5c9ca7b735967ec6a11dc6fd0e7d234c95b..7fe02ec528758293d7aebebc628948e915ada381 100644 (file)
--- a/meta
+++ b/meta
@@ -1,10 +1,10 @@
 Version: 1
-Previous: 44c348a45ba3b617a78bb0d9739dfec98a2e697d
-Head: a3630da59297e20652fc7be18edc2a49d77a81bc
+Previous: c60c4b8878aa3d73d8350a6a98ac973d2a124739
+Head: ae55bd70e9d1d4768d8a73b12a1be8f71ae83d96
 Applied:
   rs-iomap: a3630da59297e20652fc7be18edc2a49d77a81bc
+  riostream: ae55bd70e9d1d4768d8a73b12a1be8f71ae83d96
 Unapplied:
-  riostream: b441224e5f4bb54bde3ebe2bf59e0b43975653f4
   iom-dbg: 946668bccdf76e35bdace22605a43d19ed455172
   resv-rs-len: 7b6ff5c4894f54b221d877adcd709795dffb2fe9
   rs-target-sgl: 7a07c80f2242e80c076dcf3ec6bb4c94626b284f

diff --git a/patches/riostream b/patches/riostream
index b7e45a0532b00c00df8b07113862125a33290acb..a47023935895ce7828f850b737b2bee176d38739 100644 (file)
--- a/patches/riostream
+++ b/patches/riostream
@@ -1,4 +1,4 @@
-Bottom: 0f29fc79a2e44b45051dc6d32b885f356ac262aa
+Bottom: 7f355c2c4b9a69f80c172a756e9357d22ad478bf
 Top:    b7908a5c682466249184ca18ad389fa1b574c3b9
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-10-24 10:23:52 -0700
@@ -843,16 +843,3 @@ index 0000000..14e77fa
 +libibverbs README file for additional details.
 +.SH "SEE ALSO"
 +rdma_cm(7) rstream(1)
-diff --git a/src/rsocket.c b/src/rsocket.c
-index c534c61..afcc5b1 100644
---- a/src/rsocket.c
-+++ b/src/rsocket.c
-@@ -1453,7 +1453,7 @@ static int rs_send_iomaps(struct rsocket *rs, int flags)
-                       break;
-       }
- 
--      rs->iomap_pending = dlist_empty(&rs->iomap_queue);
-+      rs->iomap_pending = !dlist_empty(&rs->iomap_queue);
-       fastlock_release(&rs->iomap_lock);
-       return ret;
- }