From: Sean Hefty <sean.hefty@intel.com>
Date: Fri, 11 May 2012 16:40:28 +0000 (-0700)
Subject: refresh
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=0e510463f628d12dc407be99bf1ef589ef0f7fd1;p=~shefty%2Flibrdmacm.git

refresh
---

diff --git a/meta b/meta
index 4383dcdf..b26a87c7 100644
--- a/meta
+++ b/meta
@@ -1,10 +1,9 @@
 Version: 1
-Previous: 2d2a27f9c60d095e21d6acbec7e7e567afed5771
-Head: ce073fd3c56cffe825df8aaa0a757e5061605616
+Previous: da4a2adf1573cfd90c968e3fe0cabae18a0e3399
+Head: 5ce7d9c48d082fd1959918e9134f4bdd85c402d9
 Applied:
   rs-locking: ec6a8efe211b0dc98548443c2e0d67e2c355351f
-  reuseaddr: 0ac9e7124c0c6adf63350011f8eaf07b654d5f49
-  refresh-temp: ce073fd3c56cffe825df8aaa0a757e5061605616
+  reuseaddr: 5ce7d9c48d082fd1959918e9134f4bdd85c402d9
 Unapplied:
   comp_locks: b89aab130b4619806557e11e6b9c10964f00743f
   preload: 5dfe7abc07064485c5100e04e5412279244c2bc3
diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644
index 92660936..00000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,10 +0,0 @@
-Bottom: ea75b8334003947a7f09ba5f0efcec267b5143c1
-Top:    ea75b8334003947a7f09ba5f0efcec267b5143c1
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2012-05-11 09:40:12 -0700
-
-Refresh of reuseaddr
-
----
-
-
diff --git a/patches/reuseaddr b/patches/reuseaddr
index 71e6a85c..b5b13e13 100644
--- a/patches/reuseaddr
+++ b/patches/reuseaddr
@@ -7,7 +7,7 @@ librdmacm/rsocket: Succeed setsockopt REUSEADDR on connected sockets
 
 The RDMA CM fail calls to set REUSEADDR on an rdma_cm_id if
 it is not in the idle state.  As a result, this causes a failure
-in NetPipe when is run with socket calls intercepted by rsockets.
+in NetPipe when run with socket calls intercepted by rsockets.
 Fix this by returning success when REUSEADDR is set on an rsocket
 that has already been connected.  When running over IB, REUSEADDR
 is not necessary, since the TCP/IP addresses are mapped.