refresh

diff --git a/meta b/meta
index 11fc8590d0ee160f2ad2d2b77e82618f299c67c8..a312ebee054a69a893a725cac50d344bc0b538de 100644 (file)
--- a/meta
+++ b/meta
@@ -1,9 +1,8 @@
 Version: 1
-Previous: 39739af655c186dd95634582ac4c7d2a312f5760
-Head: cbfd0681b4c9872d36cad36b598c5b0cd230a232
+Previous: b79657609ecc24bc9f0c0bde0559148c1ad11dcc
+Head: 49fcc60d268ba85ee40dc4a4e7d3a4faac3abe9b
 Applied:
-  locking: 60eb7f20f1d4835c0004988322089722ea49338b
-  refresh-temp: cbfd0681b4c9872d36cad36b598c5b0cd230a232
+  locking: 49fcc60d268ba85ee40dc4a4e7d3a4faac3abe9b
 Unapplied:
   verbose: 6f096f8ddb8a734073e9f0d98cfec82e5dc69097
   dbg_1: 4009e8d08cde895a2c84225a8d5a1f275b15ced9

diff --git a/patches/locking b/patches/locking
index b98f908fa8359f9b530aecdf67f14e9e026bb4c8..4c0dc69a09dce6ad1025029148cf60d6f830e847 100644 (file)
--- a/patches/locking
+++ b/patches/locking
@@ -3,10 +3,14 @@ Top:    517dae237c64bc280892803e33e19d8e9a7b1c5a
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2010-12-02 14:12:56 -0800
 
-ibacm: add lock to prevent multiple daemons from running
+ibacm: Add lock to prevent multiple daemons from running
 
 Use a lock file to prevent multiple daemons from running
-simultanesouly.
+simultaneously.
+
+Without this lock, a second instance of ib_acm eventually
+fails to bind to the server's TCP port and exits, but not
+before it overwrites a portion of the log file.
 
 Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index fe36b11..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,10 +0,0 @@
-Bottom: 517dae237c64bc280892803e33e19d8e9a7b1c5a
-Top:    517dae237c64bc280892803e33e19d8e9a7b1c5a
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2010-12-08 12:37:41 -0800
-
-Refresh of locking
-
----
-
-