refresh

diff --git a/meta b/meta
index 55c0eb0f306b458e64e8da6b20136710523cf51a..725682c2138e8e32efef3db67d99d32fbaa31f92 100644 (file)
--- a/meta
+++ b/meta
@@ -1,10 +1,9 @@
 Version: 1
-Previous: dab956c3c7eef5f245a7321b2b5ac528c9f54898
-Head: 74a7626888ef63dd0386e15665a58b5f16cae56c
+Previous: c61c18028b1732d3cc71ba276095eff61004f590
+Head: c488a747b95a7b2f3092c2d26185d42ab0e69645
 Applied:
   acm: 8a0c0b32f75f1b439b5665e6047713ff6ef37ef9
-  rs-fix: 59482419509389d17feba6f6210abaec752eae80
-  refresh-temp: 74a7626888ef63dd0386e15665a58b5f16cae56c
+  rs-fix: c488a747b95a7b2f3092c2d26185d42ab0e69645
 Unapplied:
   af_ib: 2e4bfa467343c57c68616c1922c01765df3ed1db
   dbg-out: 4b4c0572eab77856d8fbb919b1feb8f3502a101a

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 011a24f..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,10 +0,0 @@
-Bottom: 30191aa638f3f574e67a71c82fa7771bcc620c52
-Top:    30191aa638f3f574e67a71c82fa7771bcc620c52
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2012-08-20 12:58:25 -0700
-
-Refresh of rs-fix
-
----
-
-

diff --git a/patches/rs-fix b/patches/rs-fix
index 526cb2bd34d79d0fc94b5a018b0feb6f8aadac5e..90e6e7e769503baa7e738637d17628901e93a13c 100644 (file)
--- a/patches/rs-fix
+++ b/patches/rs-fix
@@ -3,7 +3,13 @@ Top:    30191aa638f3f574e67a71c82fa7771bcc620c52
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-08-20 09:06:49 -0700
 
-rspreload: Fix checks in fork_active
+rspreload: Fix checks in fork_active/passive
+
+Fix passing in wrong variable to rconnect(), check state instead
+of type, and move call to getpeername until after we are sure than
+the normal socket connection has completed.
+
+Problems pointed out by Sridhar Samudrala <sri@us.ibm.com>
 
 Signed-off-by: Sean Hefty <sean.hefty@intel.com>