pick

diff --git a/meta b/meta
index 2f770c1f3c48aa8b2dd03083cbddd631a810f835..d1e520d225de22a7cd123e9084e25d957d6b5cdf 100644 (file)
--- a/meta
+++ b/meta
@@ -1,7 +1,8 @@
 Version: 1
-Previous: a4c45ac52307ee40ddaa15b1c5d857385fa3efdf
-Head: 7f02c7869431b0fc83b0a84d8e28eae06c836ca3
+Previous: 57fa7e0d19bdec1e72ed4f787e886c759c2ea1f4
+Head: e6f07ef8a07ba838a296cf09e02a1869246c6c2f
 Applied:
+  ibacmp-missing-in-acm_log-form: e6f07ef8a07ba838a296cf09e02a1869246c6c2f
 Unapplied:
   suse: 7076e2a00570a3cda4e4ce034419399a23ebfb0a
   dev-name2ip: 8e00708e882239292492e13aa51c82042255933c

diff --git a/patches/ibacmp-missing-in-acm_log-form b/patches/ibacmp-missing-in-acm_log-form
new file mode 100644 (file)
index 0000000..dc4fee5
--- /dev/null
+++ b/patches/ibacmp-missing-in-acm_log-form
@@ -0,0 +1,27 @@
+Bottom: b858d90ca19ca7f3b77f4ff170ab420d2419f2fa
+Top:    32c7ec2c8367514c25b792828db6878eba12b5c5
+Author: Kaike Wan <kaike.wan@intel.com>
+Date:   2014-11-17 10:24:01 -0500
+
+ibacmp: missing '%' in acm_log format
+
+This debugging print is in function acmp_get_ep().
+
+Signed-off-by: Kaike Wan <kaike.wan@intel.com>
+
+
+---
+
+diff --git a/prov/acmp/src/acmp.c b/prov/acmp/src/acmp.c
+index 2dd356d..7568b9c 100644
+--- a/prov/acmp/src/acmp.c
++++ b/prov/acmp/src/acmp.c
+@@ -2374,7 +2374,7 @@ acmp_get_ep(struct acmp_port *port, struct acm_endpoint *endpoint)
+       struct acmp_ep *ep;
+       DLIST_ENTRY *entry;
+ 
+-      acm_log(1, "dev 0xllx port %d pkey 0x%x\n",
++      acm_log(1, "dev 0x%llx port %d pkey 0x%x\n",
+               endpoint->port->dev->dev_guid, endpoint->port->port_num, endpoint->pkey);
+       for (entry = port->ep_list.Next; entry != &port->ep_list;
+            entry = entry->Next) {