refresh

diff --git a/meta b/meta
index f33444032bfd2a360898aa2e44ffbeb31fdf8ea0..63a69ec2f2b2c0b707963a3033192ad3ab63b8d8 100644 (file)
--- a/meta
+++ b/meta
@@ -1,10 +1,9 @@
 Version: 1
-Previous: e379419206778bd72eaf2c66fe54f2d670a11415
-Head: f43b397636d0a6363c9b94f5d1c5d968f822f5ff
+Previous: cf0b8a246d31840ea0819874ce28be3725f1a85c
+Head: 95e1f4acd08da734478ce456965d7d56f375fd99
 Applied:
   af_ib: fb683ba55480ada43c09aa48b3cb18bde139f72c
-  daemonize: c422ec9f9acd2728ae3655030c3cec67bdcc07d2
-  refresh-temp: f43b397636d0a6363c9b94f5d1c5d968f822f5ff
+  daemonize: 95e1f4acd08da734478ce456965d7d56f375fd99
 Unapplied:
   rel-1.0.6: 84d454c6b4e43f26c6570dae481f7a754cf522b0
   dev-name2ip: 8e00708e882239292492e13aa51c82042255933c

diff --git a/patches/daemonize b/patches/daemonize
index 60583015eb31968c0bec581d6c292d093a8b9407..1503db2fc90025bd4269326e9a21593206515aaa 100644 (file)
--- a/patches/daemonize
+++ b/patches/daemonize
@@ -1,5 +1,5 @@
 Bottom: 163f50499aea8749e94a5c93c4939e5f74ae1906
-Top:    f5032fb53161107c1c6cef8a3b4bf1ef5f23ba50
+Top:    f73d93c29562cc77be5e9a08e0da8c7839cde77b
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-03-30 16:31:08 -0700
 
@@ -301,7 +301,7 @@ similarity index 100%
 rename from acm_opts.cfg
 rename to ibacm_opts.cfg
 diff --git a/linux/osd.h b/linux/osd.h
-index 33ea842..f085a58 100644
+index 33ea842..f333d59 100644
 --- a/linux/osd.h
 +++ b/linux/osd.h
 @@ -45,9 +45,9 @@
@@ -311,7 +311,7 @@ index 33ea842..f085a58 100644
 -#define ACM_DEST_DIR "/etc/ibacm"\r
 -#define ACM_ADDR_FILE "acm_addr.cfg"\r
 -#define ACM_OPTS_FILE "acm_opts.cfg"\r
-+#define ACM_DEST_DIR "/etc/rdma"\r
++// #define ACM_DEST_DIR "/etc/rdma"\r
 +#define ACM_ADDR_FILE "ibacm_addr.cfg"\r
 +#define ACM_OPTS_FILE "ibacm_opts.cfg"\r
  \r

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index fc7ce4b..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,21 +0,0 @@
-Bottom: f5032fb53161107c1c6cef8a3b4bf1ef5f23ba50
-Top:    f73d93c29562cc77be5e9a08e0da8c7839cde77b
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2012-04-02 14:30:36 -0700
-
-Refresh of daemonize
-
----
-
-diff --git a/linux/osd.h b/linux/osd.h
-index f085a58..f333d59 100644
---- a/linux/osd.h
-+++ b/linux/osd.h
-@@ -45,7 +45,7 @@
- #include <sys/time.h>\r
- #include <netinet/in.h>\r
- \r
--#define ACM_DEST_DIR "/etc/rdma"\r
-+// #define ACM_DEST_DIR "/etc/rdma"\r
- #define ACM_ADDR_FILE "ibacm_addr.cfg"\r
- #define ACM_OPTS_FILE "ibacm_opts.cfg"