From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Mon, 20 Jul 2020 07:43:40 +0000 (+0200)
Subject: Merge v5.8-rc6 into char-misc-next
X-Git-Tag: v5.9-rc1~144^2~92
X-Git-Url: https://repo.jachan.dev/linux.git/commitdiff_plain/c4d41d00552754cc8cdd66a52da9b7c203884d49

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>
---

c4d41d00552754cc8cdd66a52da9b7c203884d49
diff --cc drivers/char/virtio_console.c
index 896f0ba9ba3c,ca691bce9791..a2da8f768b94
--- a/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