refresh

diff --git a/meta b/meta
index c34f7032c5cd4e0e28560b7e889a1aa88dd500ae..1f7022056ef3b7d49ec6d419e7b3a064317d44c4 100644 (file)
--- a/meta
+++ b/meta
@@ -1,9 +1,8 @@
 Version: 1
-Previous: 2f1646e89789c3a7740d96caa0e9d74027613600
-Head: 6c7a7b4e4a1d23aed3f1322729c8f6665c04fe40
+Previous: f02b66626b04476026e25b73f25c2036121765e3
+Head: 4dd1e98bd219ab47737ef2ff681800c11e4d56cb
 Applied:
-  ofed: fad2ba09c0e103dbd78543c2a59240cba726a740
-  refresh-temp: 6c7a7b4e4a1d23aed3f1322729c8f6665c04fe40
+  ofed: 4dd1e98bd219ab47737ef2ff681800c11e4d56cb
 Unapplied:
   ibacm-release-1-0-1: 37e57b99686b75791d5a3cf368d7f7ed0a29e897
 Hidden:

diff --git a/patches/ofed b/patches/ofed
index 9987eeb49509acea024d391ca3ab4f3b1703363f..0a90ce34beda91e4ad94832113c114ba0c0815fa 100644 (file)
--- a/patches/ofed
+++ b/patches/ofed
@@ -1,5 +1,5 @@
 Bottom: 087d6d362bd4701b1c1d2e3b02fbb873888cbf80
-Top:    56393beeaea7aa85bb640e1edba4f9f8761283f6
+Top:    9593c1ec8c636dfc98ed635f95b248f4373c2065
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2010-06-21 09:08:39 -0700
 
@@ -11,7 +11,7 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 ---
 
 diff --git a/Makefile.am b/Makefile.am
-index 46f68d4..f36c086 100644
+index 46f68d4..69c57c7 100644
 --- a/Makefile.am
 +++ b/Makefile.am
 @@ -8,14 +8,17 @@ util_ib_acme_SOURCES = src/acme.c linux/acme_linux.c src/libacm.c linux/libacm_l
@@ -30,7 +30,7 @@ index 46f68d4..f36c086 100644
        man/ib_acm.7
  
 -EXTRA_DIST = src/acm_mad.h src/acm_msg.h src/libacm.h linux/osd.h linux/dlist.h $(man_MANS)
-+EXTRA_DIST = src/acm_mad.h src/acm_msg.h src/libacm.h \
++EXTRA_DIST = include/infiniband/acm.h src/acm_mad.h src/acm_msg.h src/libacm.h \
 +           linux/osd.h linux/dlist.h ibacm.spec.in $(man_MANS)
  
 +dist-hook: ibacm.spec

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 1840439..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,22 +0,0 @@
-Bottom: 56393beeaea7aa85bb640e1edba4f9f8761283f6
-Top:    9593c1ec8c636dfc98ed635f95b248f4373c2065
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2010-06-24 15:25:37 -0700
-
-Refresh of ofed
-
----
-
-diff --git a/Makefile.am b/Makefile.am
-index f36c086..69c57c7 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -17,7 +17,7 @@ man_MANS = \
-       man/ib_acm.1 \
-       man/ib_acm.7
- 
--EXTRA_DIST = src/acm_mad.h src/acm_msg.h src/libacm.h \
-+EXTRA_DIST = include/infiniband/acm.h src/acm_mad.h src/acm_msg.h src/libacm.h \
-            linux/osd.h linux/dlist.h ibacm.spec.in $(man_MANS)
- 
- dist-hook: ibacm.spec