refresh

diff --git a/meta b/meta
index 0868a18a7031a96d6b8e926f1f4aef1293ce6065..aefca2de1a0466a3ba8d2b3864f13cb942f129fe 100644 (file)
--- a/meta
+++ b/meta
@@ -1,8 +1,7 @@
 Version: 1
-Previous: 08f8991bcd8214ea095b052ca02c2b8ca4f35ed4
-Head: 82eada337f803c2a84fbb283b20a75f8c82fd4d1
+Previous: 033c5415789799db6fadc0f4eb33d90a7a7218d7
+Head: d181ac6bc8261d6f0fe4935d2035e0beff560bd9
 Applied:
-  daemon: 251228ff75540352d23a9478af8fdefe730d963d
-  refresh-temp: 82eada337f803c2a84fbb283b20a75f8c82fd4d1
+  daemon: d181ac6bc8261d6f0fe4935d2035e0beff560bd9
 Unapplied:
 Hidden:

diff --git a/patches/daemon b/patches/daemon
index 76dceb47ed41dcb1007f49e023721bcc72035a4a..75c1daa490ab31fd911b11d7b3b39d57675293a1 100644 (file)
--- a/patches/daemon
+++ b/patches/daemon
@@ -1,5 +1,5 @@
 Bottom: 7ba4916f6ef28f711b42fb3c392b5c0f267a8104
-Top:    6f25fadfe2cd30b9c982082382a764ceac24b2ba
+Top:    c0b0b9437af8a63e1983d07068459108d805ce35
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2010-07-23 12:12:45 -0700
 
@@ -15,10 +15,18 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 diff --git a/src/acm.c b/src/acm.c
 old mode 100644
 new mode 100755
-index 7cd60a4..63f9954
+index 7cd60a4..2b1e1fd
 --- a/src/acm.c
 +++ b/src/acm.c
-@@ -39,6 +39,7 @@
+@@ -32,6 +32,7 @@
+ #include <string.h>
+ #include <osd.h>
+ #include <arpa/inet.h>
++#include <sys/stat.h>
+ #include <infiniband/acm.h>
+ #include <infiniband/umad.h>
+ #include <infiniband/verbs.h>
+@@ -39,6 +40,7 @@
  #include <search.h>
  #include "acm_mad.h"
  
@@ -26,7 +34,7 @@ index 7cd60a4..63f9954
  #define src_out     reserved[0]
  
  #define MAX_EP_ADDR 4
-@@ -2611,11 +2612,53 @@ static FILE *acm_open_log(void)
+@@ -2611,11 +2613,53 @@ static FILE *acm_open_log(void)
        return f;
  }
  

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 6a17fae..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,21 +0,0 @@
-Bottom: 6f25fadfe2cd30b9c982082382a764ceac24b2ba
-Top:    c0b0b9437af8a63e1983d07068459108d805ce35
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2010-07-23 17:00:04 -0700
-
-Refresh of daemon
-
----
-
-diff --git a/src/acm.c b/src/acm.c
-index 63f9954..2b1e1fd 100755
---- a/src/acm.c
-+++ b/src/acm.c
-@@ -32,6 +32,7 @@
- #include <string.h>
- #include <osd.h>
- #include <arpa/inet.h>
-+#include <sys/stat.h>
- #include <infiniband/acm.h>
- #include <infiniband/umad.h>
- #include <infiniband/verbs.h>