Merge v5.8-rc6 into char-misc-next

We need the char/misc fixes in here as well.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/char/virtio_console.c
index 896f0ba,ca691bc..a2da8f7
--- 1/drivers/char/virtio_console.c
--- 2/drivers/char/virtio_console.c
+++ b/drivers/char/virtio_console.c
@@@ -2116,8 -2116,9 +2116,9 @@@ static const struct virtio_device_id id
        { VIRTIO_ID_CONSOLE, VIRTIO_DEV_ANY_ID },
        { 0 },
  };
+ MODULE_DEVICE_TABLE(virtio, id_table);
  
 -static unsigned int features[] = {
 +static const unsigned int features[] = {
        VIRTIO_CONSOLE_F_SIZE,
        VIRTIO_CONSOLE_F_MULTIPORT,
  };
@@@ -2128,8 -2129,9 +2129,9 @@@ static const struct virtio_device_id rp
  #endif
        { 0 },
  };
+ MODULE_DEVICE_TABLE(virtio, rproc_serial_id_table);
  
 -static unsigned int rproc_serial_features[] = {
 +static const unsigned int rproc_serial_features[] = {
  };
  
  #ifdef CONFIG_PM_SLEEP