Merge branch 'for-6.7' into for-linus

diff --combined kernel/printk/printk.c
index 0b3af1529778c0ffe58675af216faeba434aba5e,1c6ed598b480387c1b64c2accbdce3dffa1902e7..a8fab94f4c040a341700ce2cf5ae507f6fc594ba
--- 1/kernel/printk/printk.c
--- 2/kernel/printk/printk.c
+++ b/kernel/printk/printk.c
@@@ -538,12 -538,14 +538,12 @@@ char *log_buf_addr_get(void
  {
        return log_buf;
  }
 -EXPORT_SYMBOL_GPL(log_buf_addr_get);
  
  /* Return log buffer size */
  u32 log_buf_len_get(void)
  {
        return log_buf_len;
  }
 -EXPORT_SYMBOL_GPL(log_buf_len_get);
  
  /*
   * Define how much of the log buffer we could take at maximum. The value
@@@ -1669,7 -1671,6 +1669,6 @@@ static int syslog_print_all(char __use
  
        prb_rec_init_rd(&r, &info, text, PRINTK_MESSAGE_MAX);
  
-       len = 0;
        prb_for_each_record(seq, prb, seq, &r) {
                int textlen;
  
@@@ -3740,18 -3741,12 +3739,18 @@@ static bool __pr_flush(struct console *
  
        seq = prb_next_seq(prb);
  
 +      /* Flush the consoles so that records up to @seq are printed. */
 +      console_lock();
 +      console_unlock();
 +
        for (;;) {
                diff = 0;
  
                /*
                 * Hold the console_lock to guarantee safe access to
 -               * console->seq.
 +               * console->seq. Releasing console_lock flushes more
 +               * records in case @seq is still not printed on all
 +               * usable consoles.
                 */
                console_lock();
  
@@@ -4194,7 -4189,6 +4193,6 @@@ bool kmsg_dump_get_buffer(struct kmsg_d
  
        prb_rec_init_rd(&r, &info, buf, size);
  
-       len = 0;
        prb_for_each_record(seq, prb, seq, &r) {
                if (r.info->seq >= iter->next_seq)
                        break;