refresh

diff --git a/meta b/meta
index 8c5c388dc3988468e014199bb3016629cd524f90..f8b0553cba12973f5e9e1dd40db1836a814e8e3c 100644 (file)
--- a/meta
+++ b/meta
@@ -1,10 +1,9 @@
 Version: 1
-Previous: 55bdb339761646df8b0e15d02249df6845cf3df2
-Head: 97753369c3a233636437deda598bf8857cea82f6
+Previous: 545fa46b3cab0363d6671c21e32e69320535a066
+Head: 71bed462cc3d62031723ce0872b4e1de68861550
 Applied:
   typo: e733d04dcaf637e600b3f1873befa4e8eaef4f83
-  daemon: 7b29fa2e46e60f2cec734b59f7efe8cdeec59660
-  refresh-temp: 97753369c3a233636437deda598bf8857cea82f6
+  daemon: 71bed462cc3d62031723ce0872b4e1de68861550
 Unapplied:
   cfg: 66af10c14df1055d97422bc056dc0897ac3a2773
   log: cbe50bfc0ec5aa61f08083722d2b3d53791195a9

diff --git a/patches/daemon b/patches/daemon
index 0adabd35335176852ab71526bbcf417827bfd4a8..88369a6e214cbd493216751e6a7604b5c4e005e4 100644 (file)
--- a/patches/daemon
+++ b/patches/daemon
@@ -1,5 +1,5 @@
 Bottom: 82cf5456563f4ef5acc5fe39b35ecb4674312f35
-Top:    d4ad38b0621522078c4a0701602ea4b83a80e903
+Top:    618c8524a45af7aa859abee4fa52733e6545dac9
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2010-07-23 12:12:45 -0700
 
@@ -15,7 +15,7 @@ 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..2b1e1fd
+index 7cd60a4..8b09453
 --- a/src/acm.c
 +++ b/src/acm.c
 @@ -32,6 +32,7 @@
@@ -26,15 +26,7 @@ index 7cd60a4..2b1e1fd
  #include <infiniband/acm.h>
  #include <infiniband/umad.h>
  #include <infiniband/verbs.h>
-@@ -39,6 +40,7 @@
- #include <search.h>
- #include "acm_mad.h"
- 
-+#define SVC_NAME    "ibacm"
- #define src_out     reserved[0]
- 
- #define MAX_EP_ADDR 4
-@@ -2611,11 +2613,53 @@ static FILE *acm_open_log(void)
+@@ -2611,11 +2612,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 40cf261..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,21 +0,0 @@
-Bottom: d4ad38b0621522078c4a0701602ea4b83a80e903
-Top:    618c8524a45af7aa859abee4fa52733e6545dac9
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2010-07-29 10:17:04 -0700
-
-Refresh of daemon
-
----
-
-diff --git a/src/acm.c b/src/acm.c
-index 2b1e1fd..8b09453 100755
---- a/src/acm.c
-+++ b/src/acm.c
-@@ -40,7 +40,6 @@
- #include <search.h>
- #include "acm_mad.h"
- 
--#define SVC_NAME    "ibacm"
- #define src_out     reserved[0]
- 
- #define MAX_EP_ADDR 4