From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 21 Jan 2021 19:37:22 +0000 (-0800)
Subject: Merge tag 'printk-for-5.11-printk-rework-fixup' of git://git.kernel.org/pub/scm/linux... 
X-Git-Tag: v5.15~1947
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2561bbbe2e959c966e21ee23de91b9bd4bbf98af;p=platform%2Fkernel%2Flinux-starfive.git

Merge tag 'printk-for-5.11-printk-rework-fixup' of git://git./linux/kernel/git/printk/linux

Pull printk fixes from Petr Mladek:

 - Fix line counting and buffer size calculation. Both regressions
   caused that a reader buffer might not get filled as much as possible.

 - Restore non-documented behavior of printk() reader API and make it
   official.

   It did not fill the last byte of the provided buffer before 5.10. Two
   architectures, powerpc and um, used it to add the trailing '\0'.
   There might theoretically be more callers depending on this behavior
   in userspace.

* tag 'printk-for-5.11-printk-rework-fixup' of git://git.kernel.org/pub/scm/linux/kernel/git/printk/linux:
  printk: fix buffer overflow potential for print_text()
  printk: fix kmsg_dump_get_buffer length calulations
  printk: ringbuffer: fix line counting
---

2561bbbe2e959c966e21ee23de91b9bd4bbf98af