refresh

diff --git a/meta b/meta
index d087899e18856b2ab174d214d2520c312bd5fa29..08f23b3827c629c8df9b5296ea75aab40367ad78 100644 (file)
--- a/meta
+++ b/meta
@@ -1,9 +1,8 @@
 Version: 1
-Previous: c52e10c2abed2c26ed53362f9fdeaaf05c937ab4
-Head: 9b7db939e40be3568811556183434a4ab96d8376
+Previous: e5f5125861e9a7f1fe5011329328a231adfb55ba
+Head: 36281f18de15f2482e21ae1304f2e34e9ecf187d
 Applied:
-  autoaddr: f7b588cb0a484c2a15c5bd81ef101c815bd992ee
-  refresh-temp: 9b7db939e40be3568811556183434a4ab96d8376
+  autoaddr: 36281f18de15f2482e21ae1304f2e34e9ecf187d
 Unapplied:
   addr_open: 5eb3d268fe35400cda8069a63415d51a035e5797
   open_dev: 3adebc52bfcb7835bf6c3f0885a611365e536386

diff --git a/patches/autoaddr b/patches/autoaddr
index ad9a39b793a191d0c37e3ed7ef31cb28d2c4d9aa..b17d70814f7c9354df6d9a8cbc7f0813cdacb853 100644 (file)
--- a/patches/autoaddr
+++ b/patches/autoaddr
@@ -1,5 +1,5 @@
 Bottom: a8e8aa49b3591176bc809c876eb5943ae719ce0d
-Top:    d65a2839777e9248477661e92509a1f24ef35537
+Top:    e214b1359219482bee2fd9e8ace89cc8c50af00a
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2011-01-20 09:30:45 -0800
 
@@ -46,9 +46,16 @@ index acf6a1d..16d899d 100644
  The IB ACM implements and provides a framework for name,
  address, and route (path) resolution services over InfiniBand.
 diff --git a/src/acm.c b/src/acm.c
-index 1f3c470..0338e80 100644
+index 1f3c470..e137f70 100644
 --- a/src/acm.c
 +++ b/src/acm.c
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2009-2010 Intel Corporation. All rights reserved.
++ * Copyright (c) 2009-2011 Intel Corporation. All rights reserved.
+  *
+  * This software is available to you under the OpenIB.org BSD license
+  * below:
 @@ -209,6 +209,7 @@ PER_THREAD char log_data[ACM_MAX_ADDRESS];
  
  static char *opts_file = "/etc/ibacm/acm_opts.cfg";

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 90afaee..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,20 +0,0 @@
-Bottom: d65a2839777e9248477661e92509a1f24ef35537
-Top:    e214b1359219482bee2fd9e8ace89cc8c50af00a
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2011-01-20 17:09:53 -0800
-
-Refresh of autoaddr
-
----
-
-diff --git a/src/acm.c b/src/acm.c
-index 0338e80..e137f70 100644
---- a/src/acm.c
-+++ b/src/acm.c
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2009-2010 Intel Corporation. All rights reserved.
-+ * Copyright (c) 2009-2011 Intel Corporation. All rights reserved.
-  *
-  * This software is available to you under the OpenIB.org BSD license
-  * below: