From: Sean Hefty <sean.hefty@intel.com>
Date: Thu, 25 Oct 2012 01:01:14 +0000 (-0700)
Subject: Refresh of iom-dbg
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=80bfb7bea244b64fcbec75b36bdc82449c5a6e88;p=~shefty%2Flibrdmacm.git

Refresh of iom-dbg
---

diff --git a/src/rsocket.c b/src/rsocket.c
index 7f1839c7..a26136dd 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;
 }