Merge commit 'c039c332f23e794deb6d6f37b9f07ff3b27fb2cf' into md

Pull in pre-requisites for adding raid10 support to dm-raid.

1 files changed, 4 insertions, 6 deletions

diff --git a/net/tipc/discover.c b/net/tipc/discover.c
index ae054cfe179f..50eaa403eb6e 100644
--- a/net/tipc/discover.c
+++ b/net/tipc/discover.c
@@ -100,14 +100,12 @@ static void disc_dupl_alert(struct tipc_bearer *b_ptr, u32 node_addr,
 {
         char node_addr_str[16];
         char media_addr_str[64];
-        struct print_buf pb;
 
         tipc_addr_string_fill(node_addr_str, node_addr);
-        tipc_printbuf_init(&pb, media_addr_str, sizeof(media_addr_str));
-        tipc_media_addr_printf(&pb, media_addr);
-        tipc_printbuf_validate(&pb);
-        warn("Duplicate %s using %s seen on <%s>\n",
-             node_addr_str, media_addr_str, b_ptr->name);
+        tipc_media_addr_printf(media_addr_str, sizeof(media_addr_str),
+                               media_addr);
+        pr_warn("Duplicate %s using %s seen on <%s>\n", node_addr_str,
+                media_addr_str, b_ptr->name);
 }
 
 /**