refresh (create temporary patch)

diff --git a/meta b/meta
index 083e48873b3d48cd9fe2fb02a12b055640ae3f5d..4463d6f37a80b7b20386c655a5ef1a87ee40f24b 100644 (file)
--- a/meta
+++ b/meta
@@ -1,8 +1,9 @@
 Version: 1
-Previous: 1d63f01ad10933d8ef3786b08e46b4f365b50027
-Head: 0841b5f6724681ed1859262c190a4dedf6df37e1
+Previous: d39f418206d5d924d486195b158f6d91c36356c0
+Head: c70fcfde8678b15b57af15265ac8420041bff0bd
 Applied:
   rs-iomap: 0841b5f6724681ed1859262c190a4dedf6df37e1
+  refresh-temp: c70fcfde8678b15b57af15265ac8420041bff0bd
 Unapplied:
   riostream: edef3f821b0265ee07b11e7a881720f72cf35fc8
   iom-dbg: 88434072d07f8edc58f454ac954d78bd39441eed

diff --git a/patches/refresh-temp b/patches/refresh-temp
new file mode 100644 (file)
index 0000000..4d3658b
--- /dev/null
+++ b/patches/refresh-temp
@@ -0,0 +1,20 @@
+Bottom: adbc5e044ca220d9d21d72e8b804f954a84df8bc
+Top:    915e0ee4505ffa5dc789b46752172eee702adae3
+Author: Sean Hefty <sean.hefty@intel.com>
+Date:   2012-10-24 22:51:47 -0700
+
+Refresh of rs-iomap
+
+---
+
+diff --git a/src/rsocket.c b/src/rsocket.c
+index f0c4c35..29b8c01 100644
+--- a/src/rsocket.c
++++ b/src/rsocket.c
+@@ -944,7 +944,6 @@ static int rs_write_direct(struct rsocket *rs, struct rs_iomap *iom, uint64_t of
+ {
+       uint64_t addr;
+ 
+-      rs->sseq_no++;
+       rs->sqe_avail--;
+       rs->sbuf_bytes_avail -= length;