Merge tag 'printk-for-5.10-rc6-fixup' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 27 Nov 2020 18:38:36 +0000 (10:38 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 27 Nov 2020 18:38:36 +0000 (10:38 -0800)
commit43d6ecd97c0c69acffc918cc18cdabdfcaa55354
tree62c04188c3f92e1fa85172872a6d587d0a07ac26
parent5b4049d8fc8353c20493f3767a1270a61bcc3822
parent739e7116b10bf8694795ed8365dd7cbe089b662a
Merge tag 'printk-for-5.10-rc6-fixup' of git://git./linux/kernel/git/printk/linux

Pull printk fixes from Petr Mladek:

 - do not lose trailing newline in pr_cont() calls

 - two trivial fixes for a dead store and a config description

* tag 'printk-for-5.10-rc6-fixup' of git://git.kernel.org/pub/scm/linux/kernel/git/printk/linux:
  printk: finalize records with trailing newlines
  printk: remove unneeded dead-store assignment
  init/Kconfig: Fix CPU number in LOG_CPU_MAX_BUF_SHIFT description
kernel/printk/printk_ringbuffer.c