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

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

Signed-off-by: Greg Kroah-Hartman <[email protected]>

diff --combined MAINTAINERS
index 07771576b0b17e4e3641ea8e15b61c0e6b09912f,d53db30d1365b796a9482302655a1c848693f256..beb18aaf640ee9ecf822c3464ce1d7fc80eb00e1
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -1170,8 -1170,6 +1170,8 @@@ M:      Todd Kjos <[email protected]
  M:    Martijn Coenen <[email protected]>
  M:    Joel Fernandes <[email protected]>
  M:    Christian Brauner <[email protected]>
 +M:    Hridya Valsaraju <[email protected]>
 +M:    Suren Baghdasaryan <[email protected]>
  L:    [email protected]
  S:    Supported
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git
@@@ -2931,6 -2929,7 +2931,7 @@@ F:      include/uapi/linux/atm
  
  ATMEL MACB ETHERNET DRIVER
  M:    Nicolas Ferre <[email protected]>
+ M:    Claudiu Beznea <[email protected]>
  S:    Supported
  F:    drivers/net/ethernet/cadence/
  
@@@ -3308,7 -3307,7 +3309,7 @@@ X:      arch/riscv/net/bpf_jit_comp32.
  
  BPF JIT for S390
  M:    Ilya Leoshkevich <[email protected]>
- M:    Heiko Carstens <heiko.carstens@de.ibm.com>
+ M:    Heiko Carstens <hca@linux.ibm.com>
  M:    Vasily Gorbik <[email protected]>
  L:    [email protected]
  L:    [email protected]
@@@ -3948,7 -3947,7 +3949,7 @@@ L:      [email protected]
  S:    Supported
  F:    drivers/char/hw_random/cctrng.c
  F:    drivers/char/hw_random/cctrng.h
- F:    Documentation/devicetree/bindings/rng/arm-cctrng.txt
+ F:    Documentation/devicetree/bindings/rng/arm-cctrng.yaml
  W:    https://developer.arm.com/products/system-ip/trustzone-cryptocell/cryptocell-700-family
  
  CEC FRAMEWORK
@@@ -5023,7 -5022,6 +5024,6 @@@ F:      drivers/mfd/da91??-*.
  F:    drivers/pinctrl/pinctrl-da90??.c
  F:    drivers/power/supply/da9052-battery.c
  F:    drivers/power/supply/da91??-*.c
- F:    drivers/regulator/da903x.c
  F:    drivers/regulator/da9???-regulator.[ch]
  F:    drivers/regulator/slg51000-regulator.[ch]
  F:    drivers/rtc/rtc-da90??.c
@@@ -5113,7 -5111,7 +5113,7 @@@ M:      Vinod Koul <[email protected]
  L:    [email protected]
  S:    Maintained
  Q:    https://patchwork.kernel.org/project/linux-dmaengine/list/
- T:    git git://git.infradead.org/users/vkoul/slave-dma.git
+ T:    git git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.git
  F:    Documentation/devicetree/bindings/dma/
  F:    Documentation/driver-api/dmaengine/
  F:    drivers/dma/
@@@ -5492,7 -5490,7 +5492,7 @@@ F:      include/uapi/drm/r128_drm.
  DRM DRIVER FOR RAYDIUM RM67191 PANELS
  M:    Robert Chiras <[email protected]>
  S:    Maintained
- F:    Documentation/devicetree/bindings/display/panel/raydium,rm67191.txt
+ F:    Documentation/devicetree/bindings/display/panel/raydium,rm67191.yaml
  F:    drivers/gpu/drm/panel/panel-raydium-rm67191.c
  
  DRM DRIVER FOR ROCKTECH JH057N00900 PANELS
@@@ -14576,8 -14574,8 +14576,8 @@@ RENESAS R-CAR THERMAL DRIVER
  M:    Niklas Söderlund <[email protected]>
  L:    [email protected]
  S:    Supported
- F:    Documentation/devicetree/bindings/thermal/rcar-gen3-thermal.txt
- F:    Documentation/devicetree/bindings/thermal/rcar-thermal.txt
+ F:    Documentation/devicetree/bindings/thermal/rcar-gen3-thermal.yaml
+ F:    Documentation/devicetree/bindings/thermal/rcar-thermal.yaml
  F:    drivers/thermal/rcar_gen3_thermal.c
  F:    drivers/thermal/rcar_thermal.c
  
@@@ -14833,7 -14831,7 +14833,7 @@@ S:   Maintaine
  F:    drivers/video/fbdev/savage/
  
  S390
- M:    Heiko Carstens <heiko.carstens@de.ibm.com>
+ M:    Heiko Carstens <hca@linux.ibm.com>
  M:    Vasily Gorbik <[email protected]>
  M:    Christian Borntraeger <[email protected]>
  L:    [email protected]
@@@ -14864,7 -14862,7 +14864,7 @@@ F:   drivers/s390/block/dasd
  F:    include/linux/dasd_mod.h
  
  S390 IOMMU (PCI)
- M:    Gerald Schaefer <gerald.schaefer@de.ibm.com>
+ M:    Gerald Schaefer <gerald.schaefer@linux.ibm.com>
  L:    [email protected]
  S:    Supported
  W:    http://www.ibm.com/developerworks/linux/linux390/
@@@ -14892,7 -14890,7 +14892,7 @@@ F:   drivers/s390/net
  
  S390 PCI SUBSYSTEM
  M:    Niklas Schnelle <[email protected]>
- M:    Gerald Schaefer <gerald.schaefer@de.ibm.com>
+ M:    Gerald Schaefer <gerald.schaefer@linux.ibm.com>
  L:    [email protected]
  S:    Supported
  W:    http://www.ibm.com/developerworks/linux/linux390/
@@@ -17515,7 -17513,7 +17515,7 @@@ F:   Documentation/admin-guide/ufs.rs
  F:    fs/ufs/
  
  UHID USERSPACE HID IO DRIVER
- M:    David Herrmann <dh.herrmann@googlemail.com>
+ M:    David Rheinsberg <david.rheinsberg@gmail.com>
  L:    [email protected]
  S:    Maintained
  F:    drivers/hid/uhid.c
@@@ -18474,7 -18472,7 +18474,7 @@@ S:   Maintaine
  F:    drivers/rtc/rtc-sd3078.c
  
  WIIMOTE HID DRIVER
- M:    David Herrmann <dh.herrmann@googlemail.com>
+ M:    David Rheinsberg <david.rheinsberg@gmail.com>
  L:    [email protected]
  S:    Maintained
  F:    drivers/hid/hid-wiimote*

diff --combined drivers/char/virtio_console.c
index 896f0ba9ba3ced95b89fc6addf7aa89d0e53831d,ca691bce97919f60332a469c968c38ce08afef1f..a2da8f768b94c058f124d35107a5c033cc8c5a9c
--- 1/drivers/char/virtio_console.c
--- 2/drivers/char/virtio_console.c
+++ b/drivers/char/virtio_console.c
@@@ -2112,24 -2112,26 +2112,26 @@@ fail
        return err;
  }
  
 -static struct virtio_device_id id_table[] = {
 +static const struct virtio_device_id id_table[] = {
        { 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,
  };
  
 -static struct virtio_device_id rproc_serial_id_table[] = {
 +static const struct virtio_device_id rproc_serial_id_table[] = {
  #if IS_ENABLED(CONFIG_REMOTEPROC)
        { VIRTIO_ID_RPROC_SERIAL, VIRTIO_DEV_ANY_ID },
  #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
@@@ -2280,6 -2282,5 +2282,5 @@@ static void __exit fini(void
  module_init(init);
  module_exit(fini);
  
- MODULE_DEVICE_TABLE(virtio, id_table);
  MODULE_DESCRIPTION("Virtio console driver");
  MODULE_LICENSE("GPL");