Merge tag 'printk-for-5.10-rc6-fixup' of git://git.kernel.org/pub/scm/linux/kernel...

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

diff --combined kernel/printk/printk_ringbuffer.c
index 6b152568527708ed618e947520fbbafe96c1237d,dd43c4cf16fb51c5462aeb627303242170212ae5..74e25a1704f2b7ee1fe0e873f68b51395bcec426
--- 1/kernel/printk/printk_ringbuffer.c
--- 2/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);