pop

diff --git a/meta b/meta
index c8b5f2e582ae8e7b69359683de7edc202efbd34a..8260f40c14445fa02d83b90e28765ff4dab55333 100644 (file)
--- a/meta
+++ b/meta
@@ -1,10 +1,10 @@
 Version: 1
-Previous: 0bd5384e8830ee959cc46af85ea5933478b665ff
-Head: b3d1911f70cd1b1dc39ff10e2a54fbf85f00370f
+Previous: d98aa44cf095827fd9078a3f73893f37e2f601f4
+Head: 6d9b27b37026f9090ad55a36f26814f90f3772dd
 Applied:
+  acm_snoop: 6d9b27b37026f9090ad55a36f26814f90f3772dd
 Unapplied:
   logging: c17b34344b1983b71aebeed9d5dd0d553e014b3b
-  acm_snoop: ebe28299ec447ff7db8947c4301e04217fe600d9
   log_lid: 421a004de5d2d9fde6bd7eba78360b1648ab3a74
   loopback: 8c3473645ff2d6097b6a9c351a726ea48c1d8165
 Hidden:

diff --git a/patches/acm_snoop b/patches/acm_snoop
index 4f8fe87ac301d159f7c5c79908fbb83d4dbb999e..48d3054010fb19714f5d9a0ed3d6d22f1b3e0ffc 100644 (file)
--- a/patches/acm_snoop
+++ b/patches/acm_snoop
@@ -1,5 +1,5 @@
-Bottom: 18456ee741149c35b5859c6627ad1b4824322404
-Top:    a73356f8275f4ece6f73baa1869b2fcabd14f560
+Bottom: 30326a5093b7b177c8d7612eba401d4999793f71
+Top:    6cb4f6d1969e3d74eccfef634bcc43eed7b2a746
 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 27a6a25..51836a8 100644
+index 820365c..0db57eb 100644
 --- a/src/acm.c
 +++ b/src/acm.c
-@@ -1022,7 +1022,7 @@ acm_process_addr_req(struct acm_ep *ep, struct ibv_wc *wc, struct acm_mad *mad)
+@@ -1010,7 +1010,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;
                }