refresh

diff --git a/meta b/meta
index 4383dcdfc0b5d2b5294542fab35b21554fe2ae58..b26a87c7654019d406b2a23e044ceba191eab67d 100644 (file)
--- 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 (file)
index 9266093..0000000
--- 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 71e6a85c96ac8fac83f5c9ca1a2863ab46cb9dd0..b5b13e13f41fa8673eff36d92e622389b75b6a61 100644 (file)
--- 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.