Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into fixes

The merge of the 'clk-for-linus' branch caused an automated
merge failure. Pull that in here so we can fix the problem.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

1 files changed, 2 insertions, 2 deletions

diff --git a/net/tipc/handler.c b/net/tipc/handler.c
index 9c6f22ff1c6d..7a52d3922f3c 100644
--- a/net/tipc/handler.c
+++ b/net/tipc/handler.c
@@ -57,14 +57,14 @@ unsigned int tipc_k_signal(Handler routine, unsigned long argument)
         struct queue_item *item;
 
         if (!handler_enabled) {
-                err("Signal request ignored by handler\n");
+                pr_err("Signal request ignored by handler\n");
                 return -ENOPROTOOPT;
         }
 
         spin_lock_bh(&qitem_lock);
         item = kmem_cache_alloc(tipc_queue_item_cache, GFP_ATOMIC);
         if (!item) {
-                err("Signal queue out of memory\n");
+                pr_err("Signal queue out of memory\n");
                 spin_unlock_bh(&qitem_lock);
                 return -ENOMEM;
         }