Merge branch 'for-5.8' into for-linus

diff --cc include/linux/console.h
Simple merge

diff --cc kernel/printk/printk.c
index c59d9a1567ad36d9e52c73488c64d0407859919e,a3990505abdf84c48715bddc6e7ea43b48c38725..2bafd5ce405732a05b2bea748d7186ec9c8e1e84
--- 1/kernel/printk/printk.c
--- 2/kernel/printk/printk.c
+++ b/kernel/printk/printk.c
@@@ -2708,16 -2685,17 +2746,15 @@@ static int try_enable_new_console(struc
   */
  void register_console(struct console *newcon)
  {
 -      int i;
        unsigned long flags;
        struct console *bcon = NULL;
 -      struct console_cmdline *c;
 -      static bool has_preferred;
 +      int err;
  
-       if (console_drivers)
-               for_each_console(bcon)
-                       if (WARN(bcon == newcon,
-                                       "console '%s%d' already registered\n",
-                                       bcon->name, bcon->index))
-                               return;
+       for_each_console(bcon) {
+               if (WARN(bcon == newcon, "console '%s%d' already registered\n",
+                                        bcon->name, bcon->index))
+                       return;
+       }
  
        /*
         * before we register a new CON_BOOT console, make sure we don't