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)
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

1  2 
kernel/printk/printk_ringbuffer.c

Simple merge