refresh

diff --git a/meta b/meta
index 86553eb2f6a0c66397762da5eeaec7b31d4fd019..11346af211dea4983f700edc7cb9af2b408453c8 100644 (file)
--- a/meta
+++ b/meta
@@ -1,9 +1,8 @@
 Version: 1
-Previous: 5b409ab96b0f3ed2e8fd72ceb4360a690246a53e
-Head: 9dfb2fc50c4a4a34270e904695767857bd537fdf
+Previous: a071648a8a257dbd91ffd36357e30fa7347b994d
+Head: c51c6e84981821b2541daba97cee9a29cd1d3709
 Applied:
-  async_mc: 66a905de19d3f55bdebd41c64c9737ccba7a6588
-  refresh-temp: 9dfb2fc50c4a4a34270e904695767857bd537fdf
+  async_mc: c51c6e84981821b2541daba97cee9a29cd1d3709
 Unapplied:
   addr_size: 8de02c47fbf595132105a7050ad6f755f49f9a7a
 Hidden:

diff --git a/patches/async_mc b/patches/async_mc
index 7add70ce23d6845777d36d5de12518cc1c5d2518..0098c73dd492eac8934a2f4fd8bd7f1616d4fda3 100644 (file)
--- a/patches/async_mc
+++ b/patches/async_mc
@@ -1,5 +1,5 @@
 Bottom: a8e8aa49b3591176bc809c876eb5943ae719ce0d
-Top:    a8e8aa49b3591176bc809c876eb5943ae719ce0d
+Top:    1192c058e05f072190ef6000481f198d7c813a79
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2011-01-19 16:33:11 -0800
 
@@ -17,4 +17,23 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 
 ---
 
-
+diff --git a/src/acm.c b/src/acm.c
+index 1f3c470..23e1e0f 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:
+@@ -1535,8 +1535,6 @@ static void acm_join_groups(void)
+ 
+                       acm_log(1, "starting join for device %s, port %d\n",
+                               dev->verbs->device->name, port->port_num);
+-                      // TODO: handle dynamic changes
+-                      //beginthread(acm_port_join, port);
+                       acm_port_join(port);
+               }
+       }

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index d5996fe..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,29 +0,0 @@
-Bottom: a8e8aa49b3591176bc809c876eb5943ae719ce0d
-Top:    1192c058e05f072190ef6000481f198d7c813a79
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2011-01-20 09:26:07 -0800
-
-Refresh of async_mc
-
----
-
-diff --git a/src/acm.c b/src/acm.c
-index 1f3c470..23e1e0f 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:
-@@ -1535,8 +1535,6 @@ static void acm_join_groups(void)
- 
-                       acm_log(1, "starting join for device %s, port %d\n",
-                               dev->verbs->device->name, port->port_num);
--                      // TODO: handle dynamic changes
--                      //beginthread(acm_port_join, port);
-                       acm_port_join(port);
-               }
-       }