refresh

diff --git a/meta b/meta
index 4b343f90ace1c85a926f623463943c1860fa3223..50524579023c9d00e4120b1bc1667e7276b063f5 100644 (file)
--- a/meta
+++ b/meta
@@ -1,10 +1,9 @@
 Version: 1
-Previous: 6db98d3d69417e488dcc624b5d1353c8fbac1e01
-Head: 69931d3886fb9814b3ce07e82c0285d16341ae08
+Previous: c26502070528103b0f10ea4708ccf1a95ba5e2bf
+Head: 4890579bfe5e96ff594d0f5be6b4dc69ce420b8b
 Applied:
   af_ib: fb683ba55480ada43c09aa48b3cb18bde139f72c
-  rename-ibacm: cd3879b0fafe82271198125e03bdd81642d3aae4
-  refresh-temp: 69931d3886fb9814b3ce07e82c0285d16341ae08
+  rename-ibacm: 4890579bfe5e96ff594d0f5be6b4dc69ce420b8b
 Unapplied:
   dev-name2ip: 8e00708e882239292492e13aa51c82042255933c
   dev-addrsize: 8de02c47fbf595132105a7050ad6f755f49f9a7a

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 5eb619c..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,17 +0,0 @@
-Bottom: 152d5d5b6582071e2ab5e568c69cde834b40b241
-Top:    ee5a2628067bf8a3611baad080f8c5d89dde03ae
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2012-03-01 16:45:01 -0800
-
-Refresh of rename-ibacm
-
----
-
-diff --git a/man/ib_acm.1 b/man/ibacm.1
-similarity index 100%
-rename from man/ib_acm.1
-rename to man/ibacm.1
-diff --git a/man/ib_acm.7 b/man/ibacm.7
-similarity index 100%
-rename from man/ib_acm.7
-rename to man/ibacm.7

diff --git a/patches/rename-ibacm b/patches/rename-ibacm
index 2178e07fbce44012ec431f3b1a4a113940035ac6..66cfd1249173902fdef9fa28d48f252ff5074bfb 100644 (file)
--- a/patches/rename-ibacm
+++ b/patches/rename-ibacm
@@ -1,5 +1,5 @@
 Bottom: 163f50499aea8749e94a5c93c4939e5f74ae1906
-Top:    152d5d5b6582071e2ab5e568c69cde834b40b241
+Top:    ee5a2628067bf8a3611baad080f8c5d89dde03ae
 Author: Doug Ledford <dledford@redhat.com>
 Date:   2012-03-01 16:40:08 -0800
 
@@ -55,3 +55,11 @@ index 503ad72..2e71faa 100644
 +
  dist-hook: ibacm.spec
        cp ibacm.spec $(distdir)
+diff --git a/man/ib_acm.1 b/man/ibacm.1
+similarity index 100%
+rename from man/ib_acm.1
+rename to man/ibacm.1
+diff --git a/man/ib_acm.7 b/man/ibacm.7
+similarity index 100%
+rename from man/ib_acm.7
+rename to man/ibacm.7