refresh

diff --git a/meta b/meta
index b7aa0ebc5b74d44c83336d757517056e37d565d7..4e5545036384fb8e65dbef58604914cb0bc804fe 100644 (file)
--- a/meta
+++ b/meta
@@ -1,14 +1,13 @@
 Version: 1
-Previous: 7a228f91c4cc394a825584c28d69a98832f85cce
-Head: bad89eb70d3c39f3ce02fb7ec924218fa3dd1d45
+Previous: d89ef08a992f378bd9392d4a9f835ac7d640dc3b
+Head: c07d89d883f1b6be6a664e95a98e3fc29f73a4b0
 Applied:
   af_ib: fb683ba55480ada43c09aa48b3cb18bde139f72c
   rename-ibacm: 62fc4bdee12905d85332875439240523fad7bee0
   file-loc: 19447bec1a6b2cae7f27654010530f95403c2239
   init-script: 44965ddd9e9685b7ae37c1b260c020a05491353c
   fixup-man: a4a1637f34f665894dc0db5a29867db6de744a43
-  rel-1.0.6: f5f19f00edb99116d2421ed4a7e38f7e5af4183a
-  refresh-temp: bad89eb70d3c39f3ce02fb7ec924218fa3dd1d45
+  rel-1.0.6: c07d89d883f1b6be6a664e95a98e3fc29f73a4b0
 Unapplied:
   dev-name2ip: 8e00708e882239292492e13aa51c82042255933c
   dev-addrsize: 8de02c47fbf595132105a7050ad6f755f49f9a7a

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 807e5e8..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,27 +0,0 @@
-Bottom: 43c0c01dcb25181ac18d9ec7f9531653244dc998
-Top:    750b6ae3720214f6625309123a1ab6928eec8773
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2012-03-30 15:47:11 -0700
-
-Refresh of rel-1.0.6
-
----
-
-diff --git a/configure.in b/configure.in
-index 736f657..7a6e1e8 100644
---- a/configure.in
-+++ b/configure.in
-@@ -1,11 +1,11 @@
- dnl Process this file with autoconf to produce a configure script.\r
- \r
- AC_PREREQ(2.57)\r
--AC_INIT(ibacm, 1.0.5, linux-rdma@vger.kernel.org)\r
-+AC_INIT(ibacm, 1.0.6, linux-rdma@vger.kernel.org)\r
- AC_CONFIG_SRCDIR([src/acm.c])\r
- AC_CONFIG_AUX_DIR(config)\r
- AM_CONFIG_HEADER(config.h)\r
--AM_INIT_AUTOMAKE(ibacm, 1.0.5)\r
-+AM_INIT_AUTOMAKE(ibacm, 1.0.6)\r
- m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])\r
- \r
- AM_PROG_LIBTOOL

diff --git a/patches/rel-1.0.6 b/patches/rel-1.0.6
index 0860fd2f2fc148406f5d14839af5ce6fb6397562..9f8a4f4b72d6a199b2231698e80ad071a51d488d 100644 (file)
--- a/patches/rel-1.0.6
+++ b/patches/rel-1.0.6
@@ -1,5 +1,5 @@
 Bottom: 43c0c01dcb25181ac18d9ec7f9531653244dc998
-Top:    43c0c01dcb25181ac18d9ec7f9531653244dc998
+Top:    750b6ae3720214f6625309123a1ab6928eec8773
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-03-30 15:46:39 -0700
 
@@ -8,4 +8,21 @@ v1.0.6
 
 ---
 
-
+diff --git a/configure.in b/configure.in
+index 736f657..7a6e1e8 100644
+--- a/configure.in
++++ b/configure.in
+@@ -1,11 +1,11 @@
+ dnl Process this file with autoconf to produce a configure script.\r
+ \r
+ AC_PREREQ(2.57)\r
+-AC_INIT(ibacm, 1.0.5, linux-rdma@vger.kernel.org)\r
++AC_INIT(ibacm, 1.0.6, linux-rdma@vger.kernel.org)\r
+ AC_CONFIG_SRCDIR([src/acm.c])\r
+ AC_CONFIG_AUX_DIR(config)\r
+ AM_CONFIG_HEADER(config.h)\r
+-AM_INIT_AUTOMAKE(ibacm, 1.0.5)\r
++AM_INIT_AUTOMAKE(ibacm, 1.0.6)\r
+ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])\r
+ \r
+ AM_PROG_LIBTOOL