refresh

diff --git a/meta b/meta
index fe67d0490fcfe07b43ddcddb51429d3d83065f2c..c65b00ba6463307ea32bdf96445775b836958c5b 100644 (file)
--- a/meta
+++ b/meta
@@ -1,6 +1,6 @@
 Version: 1
-Previous: 2f1679a77a890fd9a353a2aee0c44ea721ccb28f
-Head: 7cdebbf96fa8b16315d3ec69d1cc3454674e0677
+Previous: 46f5ee858aeb631b3c7f6f200cf925dece063962
+Head: 558e5577364aec3531c54b28def6e16f0c926524
 Applied:
   logging: 549692c49922dce3911d97dcc6d0a2fc583ab5f7
   acm_snoop: dd5542fbaa1c5a92367d0552ef3525d5ea0a4638
@@ -8,8 +8,7 @@ Applied:
   fix-text: 6d9535384c392e24b6820e6de50112b39883fe56
   dist-cfg: d2901f9410f4d3d57629189a4ff51571bb3b0cf3
   lower_retries: 25005d0475638542ab125b42d439d853c185402a
-  locking: a3e39b20a6a68bf9cc991eba690bf5d952c566ca
-  refresh-temp: 7cdebbf96fa8b16315d3ec69d1cc3454674e0677
+  locking: 558e5577364aec3531c54b28def6e16f0c926524
 Unapplied:
   verbose: f134178acabc80b0d243a84ea37d997285405c21
   acme_verbose: 45cba0846874c93ef7af156bf0afe59f43d82ea6

diff --git a/patches/locking b/patches/locking
index de6496fbab8f24f34da0eac3645d57dbef6f80fb..2b4bdc4331971b6f2e3578adf5af42491e7cd221 100644 (file)
--- a/patches/locking
+++ b/patches/locking
@@ -1,5 +1,5 @@
 Bottom: 1ac64e1267b46288459f8b4a25aeb893b3d48cba
-Top:    32588281780667752a506dba6c2782233250df24
+Top:    2895e38b888c2de8c2681ec086046cb241282cc2
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2010-12-02 14:12:56 -0800
 
@@ -31,18 +31,21 @@ index 372cd7b..7147fe2 100644
  # Default resolution protocol to resolve IP addresses into IB GIDs.\r
  # Supported protocols are:\r
 diff --git a/src/acm.c b/src/acm.c
-index 3152392..c503013 100644
+index 3152392..a680b0b 100644
 --- a/src/acm.c
 +++ b/src/acm.c
-@@ -38,6 +38,7 @@
+@@ -36,8 +36,10 @@
+ #include <string.h>
+ #include <osd.h>
  #include <arpa/inet.h>
++#include <sys/types.h>
  #include <sys/stat.h>
  #include <sys/time.h>
 +#include <fcntl.h>
  #include <infiniband/acm.h>
  #include <infiniband/umad.h>
  #include <infiniband/verbs.h>
-@@ -208,6 +209,7 @@ static char *opts_file = "/etc/ibacm/acm_opts.cfg";
+@@ -208,6 +210,7 @@ static char *opts_file = "/etc/ibacm/acm_opts.cfg";
  static char *addr_file = "/etc/ibacm/acm_addr.cfg";
  static char log_file[128] = "stdout";
  static int log_level = 0;
@@ -50,7 +53,7 @@ index 3152392..c503013 100644
  static enum acm_addr_prot addr_prot = ACM_ADDR_PROT_ACM;
  static enum acm_route_prot route_prot = ACM_ROUTE_PROT_ACM;
  static enum acm_loopback_prot loopback_prot = ACM_LOOPBACK_PROT_LOCAL;
-@@ -2654,6 +2656,8 @@ static void acm_set_options(void)
+@@ -2654,6 +2657,8 @@ static void acm_set_options(void)
                        strcpy(log_file, value);
                else if (!stricmp("log_level", opt))
                        log_level = atoi(value);
@@ -59,7 +62,7 @@ index 3152392..c503013 100644
                else if (!stricmp("addr_prot", opt))
                        addr_prot = acm_convert_addr_prot(value);
                else if (!stricmp("route_prot", opt))
-@@ -2686,6 +2690,7 @@ static void acm_set_options(void)
+@@ -2686,6 +2691,7 @@ static void acm_set_options(void)
  static void acm_log_options(void)
  {
        acm_log(0, "log level %d\n", log_level);
@@ -67,7 +70,7 @@ index 3152392..c503013 100644
        acm_log(0, "address resolution %d\n", addr_prot);
        acm_log(0, "route resolution %d\n", route_prot);
        acm_log(0, "loopback resolution %d\n", loopback_prot);
-@@ -2716,6 +2721,20 @@ static FILE *acm_open_log(void)
+@@ -2716,6 +2722,20 @@ static FILE *acm_open_log(void)
        return f;
  }
  
@@ -88,7 +91,7 @@ index 3152392..c503013 100644
  static void daemonize(void)
  {
        pid_t pid, sid;
-@@ -2778,6 +2797,8 @@ int CDECL_FUNC main(int argc, char **argv)
+@@ -2778,6 +2798,8 @@ int CDECL_FUNC main(int argc, char **argv)
                return -1;
  
        acm_set_options();

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 0e386f6..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,21 +0,0 @@
-Bottom: 32588281780667752a506dba6c2782233250df24
-Top:    2895e38b888c2de8c2681ec086046cb241282cc2
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2010-12-03 13:55:44 -0800
-
-Refresh of locking
-
----
-
-diff --git a/src/acm.c b/src/acm.c
-index c503013..a680b0b 100644
---- a/src/acm.c
-+++ b/src/acm.c
-@@ -36,6 +36,7 @@
- #include <string.h>
- #include <osd.h>
- #include <arpa/inet.h>
-+#include <sys/types.h>
- #include <sys/stat.h>
- #include <sys/time.h>
- #include <fcntl.h>