From ca41bae7d66acdcfa1decc3e3bf3b8b2501b7bf4 Mon Sep 17 00:00:00 2001
From: Sean Hefty <sean.hefty@intel.com>
Date: Mon, 2 Apr 2012 14:30:36 -0700
Subject: [PATCH] refresh

---
 meta                 |  7 +++----
 patches/daemonize    |  6 +++---
 patches/refresh-temp | 21 ---------------------
 3 files changed, 6 insertions(+), 28 deletions(-)
 delete mode 100644 patches/refresh-temp

diff --git a/meta b/meta
index f334440..63a69ec 100644
--- 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 6058301..1503db2 100644
--- 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"
 -#define ACM_ADDR_FILE "acm_addr.cfg"
 -#define ACM_OPTS_FILE "acm_opts.cfg"
-+#define ACM_DEST_DIR "/etc/rdma"
++// #define ACM_DEST_DIR "/etc/rdma"
 +#define ACM_ADDR_FILE "ibacm_addr.cfg"
 +#define ACM_OPTS_FILE "ibacm_opts.cfg"
  
diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644
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>
- #include <netinet/in.h>
- 
--#define ACM_DEST_DIR "/etc/rdma"
-+// #define ACM_DEST_DIR "/etc/rdma"
- #define ACM_ADDR_FILE "ibacm_addr.cfg"
- #define ACM_OPTS_FILE "ibacm_opts.cfg"
-- 
2.46.0