pop

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

diff --git a/patches/log_lid b/patches/log_lid
index 8684eba3cfe5b7077cb9460db6fc3ad4ec9edfd2..bb2f3a5e2a1a2173ffbf5df5ac7a1f47f365f805 100644 (file)
--- a/patches/log_lid
+++ b/patches/log_lid
@@ -1,5 +1,5 @@
-Bottom: a73356f8275f4ece6f73baa1869b2fcabd14f560
-Top:    9962a940efd219c52418715f8e1c4d496699b292
+Bottom: 6cb4f6d1969e3d74eccfef634bcc43eed7b2a746
+Top:    a9f2547719cd51bede8c11e59c05218503096632
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2010-11-15 14:05:45 -0800
 
@@ -15,10 +15,10 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 ---
 
 diff --git a/src/acm.c b/src/acm.c
-index 51836a8..daa0985 100644
+index 0db57eb..692e881 100644
 --- a/src/acm.c
 +++ b/src/acm.c
-@@ -254,6 +254,7 @@ static void acm_log_addr(int level, const char *msg, uint16_t addr_type, uint8_t
+@@ -247,6 +247,7 @@ static void acm_log_addr(int level, const char *msg, uint16_t addr_type, uint8_t
                fprintf(flog, "%s\n", ip_addr);
                break;
        case ACM_EP_INFO_ADDRESS_IP6:
@@ -26,7 +26,7 @@ index 51836a8..daa0985 100644
                inet_ntop(AF_INET6, addr, ip_addr, ACM_MAX_ADDRESS);
                fprintf(flog, "%s\n", ip_addr);
                break;
-@@ -262,6 +263,9 @@ static void acm_log_addr(int level, const char *msg, uint16_t addr_type, uint8_t
+@@ -255,6 +256,9 @@ static void acm_log_addr(int level, const char *msg, uint16_t addr_type, uint8_t
                fprintf(flog, "path record, SLID 0x%x, DLID 0x%x\n",
                        ntohs(path->slid), ntohs(path->dlid));
                break;