refresh

diff --git a/meta b/meta
index b4564b62fafab24d4dcfb1b11531f50584aef5c7..e114a01b7cfbbf380cce0a158d79863d0fdad609 100644 (file)
--- a/meta
+++ b/meta
@@ -1,9 +1,8 @@
 Version: 1
-Previous: 3a1a4433657040f0400b93c81b063f3d7d5502de
-Head: 0bdd592292b17247440568c681a044de178ed815
+Previous: 4d58f2746aae8e28253e69c3be21caecb7c24e26
+Head: e79ba5f060c56732a8fed80f069ae5105cdda277
 Applied:
-  ex-ib: bd2046e789dedd1ce9604e0cbbf1b231b6a1b4e0
-  refresh-temp: 0bdd592292b17247440568c681a044de178ed815
+  ex-ib: e79ba5f060c56732a8fed80f069ae5105cdda277
 Unapplied:
   use_acm: 78c71737918e44fe84d9ccd3ac9707567dfae2c3
   afib: ea79ee5d40967c071a420e282c15a198a434de51

diff --git a/patches/ex-ib b/patches/ex-ib
index 83b9dee01729e8e001b3bd8b6b9f2df0880e539f..e8a2bb59c85cc1817a29183772788119624d5d57 100644 (file)
--- a/patches/ex-ib
+++ b/patches/ex-ib
@@ -1,5 +1,5 @@
 Bottom: fdd78452d7e02d706c88b4821b9ff48bc33218cb
-Top:    c27d867ad4aa3272562653403c7f0f0398a62b7c
+Top:    49b5a742e5d5c31be9e2294cd15d8cbb6948eb3b
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2013-06-10 10:56:57 -0700
 
@@ -13,19 +13,18 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 ---
 
 diff --git a/configure.ac b/configure.ac
-index 35d79dd..3ce7a6e 100644
+index 35d79dd..f3bccfe 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -70,9 +70,6 @@ AC_CHECK_HEADER(valgrind/memcheck.h, [],
- fi
+@@ -71,7 +71,7 @@ fi
  fi
  
--AC_CHECK_HEADER(infiniband/acm.h, 
+ AC_CHECK_HEADER(infiniband/acm.h, 
 -      AC_DEFINE([USE_IB_ACM], 1, [setting IBACM support]), [])
--
++       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/examples/cmatose.c b/examples/cmatose.c
 index 2b6b2b1..2971ed1 100644
 --- a/examples/cmatose.c

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 5885d8b..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,23 +0,0 @@
-Bottom: c27d867ad4aa3272562653403c7f0f0398a62b7c
-Top:    49b5a742e5d5c31be9e2294cd15d8cbb6948eb3b
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2013-06-10 10:59:03 -0700
-
-Refresh of ex-ib
-
----
-
-diff --git a/configure.ac b/configure.ac
-index 3ce7a6e..f3bccfe 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -70,6 +70,9 @@ 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]),