From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 27 Nov 2020 18:38:36 +0000 (-0800)
Subject: Merge tag 'printk-for-5.10-rc6-fixup' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Url: https://repo.jachan.dev/J-linux.git/commitdiff_plain/43d6ecd97c0c69acffc918cc18cdabdfcaa55354?hp=-c

Merge tag 'printk-for-5.10-rc6-fixup' of git://git.kernel.org/pub/scm/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
---

43d6ecd97c0c69acffc918cc18cdabdfcaa55354
diff --combined kernel/printk/printk_ringbuffer.c
index 6b1525685277,dd43c4cf16fb..74e25a1704f2
--- a/kernel/printk/printk_ringbuffer.c
+++ b/kernel/printk/printk_ringbuffer.c
@@@ -345,7 -345,7 +345,7 @@@ DESC_ID((id) - DESCS_COUNT(desc_ring)
   */
  struct prb_data_block {
  	unsigned long	id;
 -	char		data[0];
 +	char		data[];
  };
  
  /*
@@@ -882,8 -882,6 +882,6 @@@ static bool desc_reserve(struct printk_
  	head_id = atomic_long_read(&desc_ring->head_id); /* LMM(desc_reserve:A) */
  
  	do {
- 		desc = to_desc(desc_ring, head_id);
- 
  		id = DESC_ID(head_id + 1);
  		id_prev_wrap = DESC_ID_PREV_WRAP(desc_ring, id);