refresh

diff --git a/meta b/meta
index eef41a04e10241a704aa3e33325072d3b7bc746f..45f84f8c137dc459b9fb0be3c2a50d35a2d3a7f3 100644 (file)
--- a/meta
+++ b/meta
@@ -1,10 +1,9 @@
 Version: 1
-Previous: 4ff21ca9886a50d92a12c37db66d48f1c29c8a86
-Head: 89400c481b5d0269e89fab48f19dce005a225988
+Previous: 801e7c279e85fa7cebfb7b9e5fa1d138a45613e4
+Head: 04873710522e40b3129fb7c890298052b7cf4b15
 Applied:
   ex-ib: d71ebf70cf74111cfd5f0982d9abe6ec68fb38e3
-  use_acm: 21af6509d3251cde75dc648fee74d2efb6817176
-  refresh-temp: 89400c481b5d0269e89fab48f19dce005a225988
+  use_acm: 04873710522e40b3129fb7c890298052b7cf4b15
 Unapplied:
   seterr: 47eb0c419687c2690292c1910acae83a46e5388c
   clisvr: 0db572abcf3d78374a5ea0f91b709136948809cc

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 5bac68f..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,23 +0,0 @@
-Bottom: 0f30ed22a8e534bf84ea0c70fd9650cb6cebd864
-Top:    c27d867ad4aa3272562653403c7f0f0398a62b7c
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2013-06-10 11:00:30 -0700
-
-Refresh of use_acm
-
----
-
-diff --git a/configure.ac b/configure.ac
-index 35d79dd..3ce7a6e 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -70,9 +70,6 @@ AC_CHECK_HEADER(valgrind/memcheck.h, [],
- fi
- fi
- 
--AC_CHECK_HEADER(infiniband/acm.h, 
--      AC_DEFINE([USE_IB_ACM], 1, [setting IBACM support]), [])
--
- AC_CHECK_HEADER(infiniband/acm.h,
-       AC_CHECK_MEMBER(struct acm_msg.resolve_data, [],
-               AC_DEFINE(DEFINE_ACM_MSG, 1, [adding ACM message definition]),

diff --git a/patches/use_acm b/patches/use_acm
index d16bd69e8dc5c50a6bd433c8019d329c07808315..74a9409c3d68b4988fb851f5fc4fb8b93cb72569 100644 (file)
--- a/patches/use_acm
+++ b/patches/use_acm
@@ -1,5 +1,5 @@
 Bottom: 0f30ed22a8e534bf84ea0c70fd9650cb6cebd864
-Top:    0f30ed22a8e534bf84ea0c70fd9650cb6cebd864
+Top:    c27d867ad4aa3272562653403c7f0f0398a62b7c
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2013-06-10 10:57:56 -0700
 
@@ -17,4 +17,17 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 
 ---
 
-
+diff --git a/configure.ac b/configure.ac
+index 35d79dd..3ce7a6e 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -70,9 +70,6 @@ AC_CHECK_HEADER(valgrind/memcheck.h, [],
+ fi
+ fi
+ 
+-AC_CHECK_HEADER(infiniband/acm.h, 
+-      AC_DEFINE([USE_IB_ACM], 1, [setting IBACM support]), [])
+-
+ AC_CHECK_HEADER(infiniband/acm.h,
+       AC_CHECK_MEMBER(struct acm_msg.resolve_data, [],
+               AC_DEFINE(DEFINE_ACM_MSG, 1, [adding ACM message definition]),