refresh (create temporary patch)

diff --git a/meta b/meta
index 32b095d68cddfba055f922e0646750c974a293c2..058b7b6e6e15da877c0cd49d7c17f570f463a348 100644 (file)
--- a/meta
+++ b/meta
@@ -1,10 +1,11 @@
 Version: 1
-Previous: 4284a55459ae850e727ebb77d2318c66f0739b49
-Head: ea7789b419a7d6ef50d4f479c4ae005e518367b5
+Previous: d565f9d4796c16cbe3d2490674ef2b056b5b5e43
+Head: 80bfb7bea244b64fcbec75b36bdc82449c5a6e88
 Applied:
   rs-iomap: a3630da59297e20652fc7be18edc2a49d77a81bc
   riostream: ae55bd70e9d1d4768d8a73b12a1be8f71ae83d96
   iom-dbg: ea7789b419a7d6ef50d4f479c4ae005e518367b5
+  refresh-temp: 80bfb7bea244b64fcbec75b36bdc82449c5a6e88
 Unapplied:
   resv-rs-len: 7b6ff5c4894f54b221d877adcd709795dffb2fe9
   rs-target-sgl: 7a07c80f2242e80c076dcf3ec6bb4c94626b284f

diff --git a/patches/refresh-temp b/patches/refresh-temp
new file mode 100644 (file)
index 0000000..c97b9b1
--- /dev/null
+++ b/patches/refresh-temp
@@ -0,0 +1,26 @@
+Bottom: 3856535c45f2f5e2ce535550e9fde9f596d71890
+Top:    62f2eaba3f5e079d0c5f4f1797703bc11b4d0366
+Author: Sean Hefty <sean.hefty@intel.com>
+Date:   2012-10-24 18:01:14 -0700
+
+Refresh of iom-dbg
+
+---
+
+diff --git a/src/rsocket.c b/src/rsocket.c
+index 7f1839c..a26136d 100644
+--- a/src/rsocket.c
++++ b/src/rsocket.c
+@@ -1458,12 +1458,8 @@ static int rs_send_iomaps(struct rsocket *rs, int flags)
+                       break;
+       }
+ 
+-<<<<<<< current
+       rs->iomap_pending = !dlist_empty(&rs->iomap_queue);
+-=======
+-      rs->iomap_pending = dlist_empty(&rs->iomap_queue);
+       printf("%s - pending = %d\n", __func__, rs->iomap_pending);
+->>>>>>> patched
+       fastlock_release(&rs->iomap_lock);
+       return ret;
+ }