Merge branch 'rework/console-list-lock' into for-linus

diff --combined kernel/printk/printk.c
index 7decf1e9c48635c3b151661208108a70c5d63e22,39221b0f918dbd697d60622150f49193db07ad0b..a5ed2e53547c94fdcd016427111f2bc26ee8cc74
--- 1/kernel/printk/printk.c
--- 2/kernel/printk/printk.c
+++ b/kernel/printk/printk.c
@@@ -123,6 -123,7 +123,7 @@@ bool console_srcu_read_lock_is_held(voi
  {
        return srcu_read_lock_held(&console_srcu);
  }
+ EXPORT_SYMBOL(console_srcu_read_lock_is_held);
  #endif
  
  enum devkmsg_log_bits {
@@@ -1891,6 -1892,7 +1892,7 @@@ static void console_lock_spinning_enabl
  /**
   * console_lock_spinning_disable_and_check - mark end of code where another
   *    thread was able to busy wait and check if there is a waiter
+  * @cookie: cookie returned from console_srcu_read_lock()
   *
   * This is called at the end of the section where spinning is allowed.
   * It has two functions. First, it is a signal that it is no longer
@@@ -2480,7 -2482,7 +2482,7 @@@ static int __add_preferred_console(cha
                return -E2BIG;
        if (!brl_options)
                preferred_console = i;
 -      strlcpy(c->name, name, sizeof(c->name));
 +      strscpy(c->name, name, sizeof(c->name));
        c->options = options;
        set_user_specified(c, user_specified);
        braille_set_options(c, brl_options);