pop

diff --git a/meta b/meta
index b836282bf2f9d47497b16689a256bb4eb6ff9f51..6ce5737fc120f1c112a7ec263d4d3d90427c9b81 100644 (file)
--- a/meta
+++ b/meta
@@ -1,10 +1,10 @@
 Version: 1
-Previous: 0e7805fa056a3e4bab132ba20cd2608e5c194615
-Head: 3f78a720520be5f98889b3b88dbb6344fa227466
+Previous: 4ec09d98f641d12df696c4bd7e2cdb807f90752f
+Head: 1058fcd62957c0ba92ef1965ae6dc8b2aa8f1ec4
 Applied:
   opt_mc_av: 3f78a720520be5f98889b3b88dbb6344fa227466
+  one_mc_join: 1058fcd62957c0ba92ef1965ae6dc8b2aa8f1ec4
 Unapplied:
-  one_mc_join: ef3728004507256635ad95161cd92811661affbe
   dyn_ah: cb5ff3ef664771b3c243847abef220e0151063ee
   addr_size: 8de02c47fbf595132105a7050ad6f755f49f9a7a
 Hidden:

diff --git a/patches/one_mc_join b/patches/one_mc_join
index 2b2c6448fc0c0a99a3a6c702a3103f4f94305540..5f688d15fc4ad8ad3a6bf33b7b406f49f3bce59b 100644 (file)
--- a/patches/one_mc_join
+++ b/patches/one_mc_join
@@ -1,5 +1,5 @@
-Bottom: ff1f0e0cc0c31d7a9b01b551462a6a3a0612e4b9
-Top:    c93d236ca31c4be364371bb05930f374530864e6
+Bottom: 613b7a74933df2af9b7b765f153ed3c74a67c4e1
+Top:    0e56d97e8e6ce359a7d2f4979f99fcc197cb8302
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2011-04-01 15:58:19 -0700
 
@@ -16,10 +16,10 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 ---
 
 diff --git a/src/acm.c b/src/acm.c
-index 0dbc23c..7c6cd11 100644
+index 3df996b..fe42498 100644
 --- a/src/acm.c
 +++ b/src/acm.c
-@@ -1557,7 +1557,8 @@ static void acm_port_join(struct acm_port *port)
+@@ -1556,7 +1556,8 @@ static void acm_port_join(struct acm_port *port)
                if ((ep->state = ep->mc_dest[0].state) != ACM_READY)
                        continue;