pop

diff --git a/meta b/meta
index 9b43a9a63b59a87ef188d9c9b6b9316fc77519d0..e5251a838ee24817c308dd1e9a10fd02c7895762 100644 (file)
--- a/meta
+++ b/meta
@@ -1,10 +1,10 @@
 Version: 1
-Previous: 80019ddcdbb796c141db6b25109e5cf1525ecd63
-Head: b69e982755c03636396faab8b31f5359e5a67a6b
+Previous: 2057584e62c0884a0f1cdae32a272ec8583371d5
+Head: a8dc60dcbdd2ab3da998585bc84770e6d59f0114
 Applied:
   logging: 88d1bcda7ee4d64fe55e1e639cd485422a30c23b
   logging2: b69e982755c03636396faab8b31f5359e5a67a6b
+  acm_snoop: a8dc60dcbdd2ab3da998585bc84770e6d59f0114
 Unapplied:
-  acm_snoop: bfcb41cccea5442ff7996133c7dd8e11362b041e
   loopback: 8c3473645ff2d6097b6a9c351a726ea48c1d8165
 Hidden:

diff --git a/patches/acm_snoop b/patches/acm_snoop
index 80c6c48e60328aedad3d14593992e0a423d36cc1..4f8fe87ac301d159f7c5c79908fbb83d4dbb999e 100644 (file)
--- a/patches/acm_snoop
+++ b/patches/acm_snoop
@@ -1,5 +1,5 @@
-Bottom: d1d96503c5833062d50818f5ab44f42d2432089a
-Top:    0f063c91893feaff89b12fc524a41fee5462240a
+Bottom: 18456ee741149c35b5859c6627ad1b4824322404
+Top:    a73356f8275f4ece6f73baa1869b2fcabd14f560
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2010-11-15 12:08:46 -0800
 
@@ -27,10 +27,10 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 ---
 
 diff --git a/src/acm.c b/src/acm.c
-index f5eec84..41eb64e 100644
+index 27a6a25..51836a8 100644
 --- a/src/acm.c
 +++ b/src/acm.c
-@@ -1020,7 +1020,7 @@ acm_process_addr_req(struct acm_ep *ep, struct ibv_wc *wc, struct acm_mad *mad)
+@@ -1022,7 +1022,7 @@ acm_process_addr_req(struct acm_ep *ep, struct ibv_wc *wc, struct acm_mad *mad)
                        status = acm_record_acm_route(ep, dest);
                        break;
                }