From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 21 Nov 2017 15:28:13 +0000 (-1000)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/pmladek... 
X-Git-Tag: ceph-for-4.15-rc4~70
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=11ca75d2d6d18d5a7ee4d7ec1da6f864f5c8c8be;p=ceph-client.git

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/pmladek/printk

Pull printk updates from Petr Mladek:

 - print the warning about dropped messages on consoles on a separate
   line.   It makes it more legible.

 - one typo fix and small code clean up.

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/pmladek/printk:
  added new line symbol after warning about dropped messages
  printk: fix typo in printk_safe.c
  printk: simplify no_printk()
---

11ca75d2d6d18d5a7ee4d7ec1da6f864f5c8c8be