---

yaml
---
r: 18287
b: refs/heads/master
c: d0a14a9
h: refs/heads/master
i:
  18285: b513958
  18283: 3695890
  18279: 3946728
  18271: 08b2406
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9ea1fd3c1a15c620d1e3d0aa269d34b705477003
+refs/heads/master: d0a14a9dbdf613d9307c4b748b03a11678fe8d16

trunk/net/tipc/core.h

@@ -117,9 +117,9 @@ void tipc_dump(struct print_buf*,const char *fmt, ...);
  * - debug messages are not printed
  */
 
-#define err(fmt, arg...)  printk(KERN_ERR "%s: " fmt "\n" , __FILE__ , ## arg)
-#define info(fmt, arg...) printk(KERN_INFO "%s: " fmt "\n" , __FILE__ , ## arg)
-#define warn(fmt, arg...) printk(KERN_WARNING "%s: " fmt "\n" , __FILE__ , ## arg)
+#define err(fmt, arg...)  printk(KERN_ERR "TIPC: " fmt , ## arg)
+#define info(fmt, arg...) printk(KERN_INFO "TIPC: " fmt , ## arg)
+#define warn(fmt, arg...) printk(KERN_WARNING "TIPC: " fmt , ## arg)
 
 #define dbg(fmt, arg...) do {} while (0)
 #define msg_dbg(msg,txt) do {} while (0)

trunk/net/tipc/netlink.c

@@ -100,7 +100,7 @@ int netlink_start(void)
 	genl_unregister_family(&family);
 	family_registered = 0;
  err:
-	err("Failed to register netlink interface");
+	err("Failed to register netlink interface\n");
 	return -EFAULT;
 }
 

trunk/net/tipc/socket.c

@@ -1696,13 +1696,13 @@ int socket_init(void)
 
         res = proto_register(&tipc_proto, 1);
 	if (res) {
-		err("Unable to register TIPC protocol type\n");
+		err("Failed to register TIPC protocol type\n");
 		goto out;
 	}
 
 	res = sock_register(&tipc_family_ops);
 	if (res) {
-		err("Unable to register TIPC socket type\n");
+		err("Failed to register TIPC socket type\n");
 		proto_unregister(&tipc_proto);
 		goto out;
 	}

trunk/net/tipc/subscr.c

@@ -488,7 +488,7 @@ int subscr_start(void)
 	return 0;
 
 failed:
-	err("Unable to create subscription service\n");
+	err("Failed to create subscription service\n");
 	tipc_detach(topsrv.user_ref);
 	topsrv.user_ref = 0;
 	spin_unlock_bh(&topsrv.lock);