Merge tag 'shmob-drm-atomic-dt-tag2' of git://git.kernel.org/pub/scm/linux/kernel...

drm: renesas: shmobile: Atomic conversion + DT support

Currently, there are two drivers for the LCD controller on Renesas
SuperH-based and ARM-based SH-Mobile and R-Mobile SoCs:
  1. sh_mobile_lcdcfb, using the fbdev framework,
  2. shmob_drm, using the DRM framework.
However, only the former driver is used, as all platform support
integrates the former.  None of these drivers support DT-based systems.

Convert the SH-Mobile DRM driver to atomic modesetting, and add DT
support, complemented by the customary set of fixes and improvements.

Acked-by: Laurent Pinchart <[email protected]>
Link: https://lore.kernel.org/r/[email protected]/
Signed-off-by: Dave Airlie <[email protected]>
From: Geert Uytterhoeven <[email protected]>
Link: https://patchwork.freedesktop.org/patch/msgid/CAMuHMdUF61V5qNyKbrTGxZfEJvCVuLO7q2R5MqZYkzRC_cNr0w@mail.gmail.com

diff --combined MAINTAINERS
index 78f2a91e6a1d02bbf68e9e998e1564aaee9c4250,c5f67ee3e6f2979419cdb1f8e3ee914e00720f8c..41b2e0f6c5d6a1cce02c6a09aedf16c76081c12e
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -378,9 -378,8 +378,9 @@@ F: drivers/acpi/viot.
  F:    include/linux/acpi_viot.h
  
  ACPI WMI DRIVER
 +M:    Armin Wolf <[email protected]>
  L:    [email protected]
 -S:    Orphan
 +S:    Maintained
  F:    Documentation/driver-api/wmi.rst
  F:    Documentation/wmi/
  F:    drivers/platform/x86/wmi.c
@@@ -471,6 -470,7 +471,6 @@@ F: drivers/hwmon/adm1029.
  ADM8211 WIRELESS DRIVER
  L:    [email protected]
  S:    Orphan
 -W:    https://wireless.wiki.kernel.org/
  F:    drivers/net/wireless/admtek/adm8211.*
  
  ADP1653 FLASH CONTROLLER DRIVER
@@@ -1585,17 -1585,6 +1585,17 @@@ F:    arch/arm/include/asm/arch_timer.
  F:    arch/arm64/include/asm/arch_timer.h
  F:    drivers/clocksource/arm_arch_timer.c
  
 +ARM GENERIC INTERRUPT CONTROLLER DRIVERS
 +M:    Marc Zyngier <[email protected]>
 +L:    [email protected] (moderated for non-subscribers)
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/interrupt-controller/arm,gic*
 +F:    arch/arm/include/asm/arch_gicv3.h
 +F:    arch/arm64/include/asm/arch_gicv3.h
 +F:    drivers/irqchip/irq-gic*.[ch]
 +F:    include/linux/irqchip/arm-gic*.h
 +F:    include/linux/irqchip/arm-vgic-info.h
 +
  ARM HDLCD DRM DRIVER
  M:    Liviu Dudau <[email protected]>
  S:    Supported
@@@ -1643,7 -1632,6 +1643,7 @@@ R:      Steven Price <[email protected]
  L:    [email protected]
  S:    Supported
  T:    git git://anongit.freedesktop.org/drm/drm-misc
 +F:    Documentation/gpu/panfrost.rst
  F:    drivers/gpu/drm/panfrost/
  F:    include/uapi/drm/panfrost_drm.h
  
@@@ -1673,7 -1661,7 +1673,7 @@@ F:      arch/arm*/include/asm/perf_event.
  F:    arch/arm*/kernel/hw_breakpoint.c
  F:    arch/arm*/kernel/perf_*
  F:    drivers/perf/
 -F:    include/linux/perf/arm_pmu.h
 +F:    include/linux/perf/arm_pmu*.h
  
  ARM PORT
  M:    Russell King <[email protected]>
@@@ -1974,12 -1962,12 +1974,12 @@@ F:   drivers/irqchip/irq-aspeed-i2c-ic.
  
  ARM/ASPEED MACHINE SUPPORT
  M:    Joel Stanley <[email protected]>
 -R:    Andrew Jeffery <andrew@aj.id.au>
 +R:    Andrew Jeffery <andrew@codeconstruct.com.au>
  L:    [email protected] (moderated for non-subscribers)
  L:    [email protected] (moderated for non-subscribers)
  S:    Supported
  Q:    https://patchwork.ozlabs.org/project/linux-aspeed/list/
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/joel/aspeed.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/joel/bmc.git
  F:    Documentation/devicetree/bindings/arm/aspeed/
  F:    arch/arm/boot/dts/aspeed/
  F:    arch/arm/mach-aspeed/
@@@ -2222,28 -2210,21 +2222,28 @@@ F:   arch/arm/boot/dts/ti/omap/omap3-igep
  ARM/INTEL IXP4XX ARM ARCHITECTURE
  M:    Linus Walleij <[email protected]>
  M:    Imre Kaloz <[email protected]>
 -M:    Krzysztof Halasa <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
  F:    Documentation/devicetree/bindings/arm/intel-ixp4xx.yaml
  F:    Documentation/devicetree/bindings/gpio/intel,ixp4xx-gpio.txt
  F:    Documentation/devicetree/bindings/interrupt-controller/intel,ixp4xx-interrupt.yaml
  F:    Documentation/devicetree/bindings/memory-controllers/intel,ixp4xx-expansion*
 +F:    Documentation/devicetree/bindings/rng/intel,ixp46x-rng.yaml
  F:    Documentation/devicetree/bindings/timer/intel,ixp4xx-timer.yaml
  F:    arch/arm/boot/dts/intel/ixp/
  F:    arch/arm/mach-ixp4xx/
  F:    drivers/bus/intel-ixp4xx-eb.c
 +F:    drivers/char/hw_random/ixp4xx-rng.c
  F:    drivers/clocksource/timer-ixp4xx.c
  F:    drivers/crypto/intel/ixp4xx/ixp4xx_crypto.c
  F:    drivers/gpio/gpio-ixp4xx.c
  F:    drivers/irqchip/irq-ixp4xx.c
 +F:    drivers/net/ethernet/xscale/ixp4xx_eth.c
 +F:    drivers/net/wan/ixp4xx_hss.c
 +F:    drivers/soc/ixp4xx/ixp4xx-npe.c
 +F:    drivers/soc/ixp4xx/ixp4xx-qmgr.c
 +F:    include/linux/soc/ixp4xx/npe.h
 +F:    include/linux/soc/ixp4xx/qmgr.h
  
  ARM/INTEL KEEMBAY ARCHITECTURE
  M:    Paul J. Murphy <[email protected]>
@@@ -2345,7 -2326,7 +2345,7 @@@ F:      drivers/rtc/rtc-mt7622.
  
  ARM/Mediatek SoC support
  M:    Matthias Brugger <[email protected]>
 -R:    AngeloGioacchino Del Regno <[email protected]>
 +M:    AngeloGioacchino Del Regno <[email protected]>
  L:    [email protected]
  L:    [email protected] (moderated for non-subscribers)
  L:    [email protected] (moderated for non-subscribers)
@@@ -3076,7 -3057,7 +3076,7 @@@ F:      Documentation/devicetree/bindings/pe
  F:    drivers/peci/controller/peci-aspeed.c
  
  ASPEED PINCTRL DRIVERS
 -M:    Andrew Jeffery <andrew@aj.id.au>
 +M:    Andrew Jeffery <andrew@codeconstruct.com.au>
  L:    [email protected] (moderated for non-subscribers)
  L:    [email protected] (moderated for non-subscribers)
  L:    [email protected]
@@@ -3093,7 -3074,7 +3093,7 @@@ F:      drivers/irqchip/irq-aspeed-scu-ic.
  F:    include/dt-bindings/interrupt-controller/aspeed-scu-ic.h
  
  ASPEED SD/MMC DRIVER
 -M:    Andrew Jeffery <andrew@aj.id.au>
 +M:    Andrew Jeffery <andrew@codeconstruct.com.au>
  L:    [email protected] (moderated for non-subscribers)
  L:    [email protected] (moderated for non-subscribers)
  L:    [email protected]
@@@ -3362,7 -3343,7 +3362,7 @@@ AX.25 NETWORK LAYE
  M:    Ralf Baechle <[email protected]>
  L:    [email protected]
  S:    Maintained
 -W:    http://www.linux-ax25.org/
 +W:    https://linux-ax25.in-berlin.de
  F:    include/net/ax25.h
  F:    include/uapi/linux/ax25.h
  F:    net/ax25/
@@@ -4100,7 -4081,7 +4100,7 @@@ F:      drivers/net/wireless/broadcom/brcm80
  
  BROADCOM BRCMSTB GPIO DRIVER
  M:    Doug Berger <[email protected]>
 -M:    Florian Fainelli <florian.fainelli@broadcom>
 +M:    Florian Fainelli <florian.fainelli@broadcom.com>
  R:    Broadcom internal kernel review list <[email protected]>
  S:    Supported
  F:    Documentation/devicetree/bindings/gpio/brcm,brcmstb-gpio.yaml
@@@ -6003,8 -5984,8 +6003,8 @@@ F:      include/linux/devm-helpers.
  DEVICE-MAPPER  (LVM)
  M:    Alasdair Kergon <[email protected]>
  M:    Mike Snitzer <[email protected]>
 -M:    dm-devel@redhat.com
 -L:    dm-devel@redhat.com
 +M:    dm-devel@lists.linux.dev
 +L:    dm-devel@lists.linux.dev
  S:    Maintained
  W:    http://sources.redhat.com/dm
  Q:    http://patchwork.kernel.org/project/dm-devel/list/
@@@ -6632,7 -6613,6 +6632,7 @@@ S:      Maintaine
  B:    https://gitlab.freedesktop.org/drm/msm/-/issues
  T:    git https://gitlab.freedesktop.org/drm/msm.git
  F:    Documentation/devicetree/bindings/display/msm/
 +F:    drivers/gpu/drm/ci/xfails/msm*
  F:    drivers/gpu/drm/msm/
  F:    include/uapi/drm/msm_drm.h
  
@@@ -6665,9 -6645,9 +6665,9 @@@ F:      Documentation/devicetree/bindings/di
  F:    drivers/gpu/drm/panel/panel-novatek-nt36672a.c
  
  DRM DRIVER FOR NVIDIA GEFORCE/QUADRO GPUS
 -M:    Ben Skeggs <[email protected]>
  M:    Karol Herbst <[email protected]>
  M:    Lyude Paul <[email protected]>
 +M:    Danilo Krummrich <[email protected]>
  L:    [email protected]
  L:    [email protected]
  S:    Supported
@@@ -6784,8 -6764,7 +6784,8 @@@ DRM DRIVER FOR SOLOMON SSD130X OLED DIS
  M:    Javier Martinez Canillas <[email protected]>
  S:    Maintained
  T:    git git://anongit.freedesktop.org/drm/drm-misc
 -F:    Documentation/devicetree/bindings/display/solomon,ssd1307fb.yaml
 +F:    Documentation/devicetree/bindings/display/solomon,ssd-common.yaml
 +F:    Documentation/devicetree/bindings/display/solomon,ssd13*.yaml
  F:    drivers/gpu/drm/solomon/ssd130x*
  
  DRM DRIVER FOR ST-ERICSSON MCDE
@@@ -6880,26 -6859,12 +6880,26 @@@ M:   Thomas Zimmermann <tzimmermann@suse.
  S:    Maintained
  W:    https://01.org/linuxgraphics/gfx-docs/maintainer-tools/drm-misc.html
  T:    git git://anongit.freedesktop.org/drm/drm-misc
 +F:    Documentation/devicetree/bindings/display/
 +F:    Documentation/devicetree/bindings/gpu/
  F:    Documentation/gpu/
 -F:    drivers/gpu/drm/*
 +F:    drivers/gpu/drm/
  F:    drivers/gpu/vga/
 -F:    include/drm/drm*
 +F:    include/drm/drm
  F:    include/linux/vga*
 -F:    include/uapi/drm/drm*
 +F:    include/uapi/drm/
 +X:    drivers/gpu/drm/amd/
 +X:    drivers/gpu/drm/armada/
 +X:    drivers/gpu/drm/etnaviv/
 +X:    drivers/gpu/drm/exynos/
 +X:    drivers/gpu/drm/i915/
 +X:    drivers/gpu/drm/kmb/
 +X:    drivers/gpu/drm/mediatek/
 +X:    drivers/gpu/drm/msm/
 +X:    drivers/gpu/drm/nouveau/
 +X:    drivers/gpu/drm/radeon/
 +X:    drivers/gpu/drm/renesas/
 +X:    drivers/gpu/drm/tegra/
  
  DRM DRIVERS FOR ALLWINNER A10
  M:    Maxime Ripard <[email protected]>
@@@ -6920,7 -6885,6 +6920,7 @@@ T:      git git://anongit.freedesktop.org/dr
  F:    Documentation/devicetree/bindings/display/amlogic,meson-dw-hdmi.yaml
  F:    Documentation/devicetree/bindings/display/amlogic,meson-vpu.yaml
  F:    Documentation/gpu/meson.rst
 +F:    drivers/gpu/drm/ci/xfails/meson*
  F:    drivers/gpu/drm/meson/
  
  DRM DRIVERS FOR ATMEL HLCDC
@@@ -7033,7 -6997,6 +7033,7 @@@ L:      [email protected]
  L:    [email protected] (moderated for non-subscribers)
  S:    Supported
  F:    Documentation/devicetree/bindings/display/mediatek/
 +F:    drivers/gpu/drm/ci/xfails/mediatek*
  F:    drivers/gpu/drm/mediatek/
  F:    drivers/phy/mediatek/phy-mtk-dp.c
  F:    drivers/phy/mediatek/phy-mtk-hdmi*
@@@ -7053,7 -7016,7 +7053,7 @@@ F:      drivers/gpu/host1x
  F:    include/linux/host1x.h
  F:    include/uapi/drm/tegra_drm.h
  
- DRM DRIVERS FOR RENESAS
+ DRM DRIVERS FOR RENESAS R-CAR
  M:    Laurent Pinchart <[email protected]>
  M:    Kieran Bingham <[email protected]>
  L:    [email protected]
@@@ -7064,7 -7027,16 +7064,16 @@@ F:    Documentation/devicetree/bindings/di
  F:    Documentation/devicetree/bindings/display/bridge/renesas,dw-hdmi.yaml
  F:    Documentation/devicetree/bindings/display/bridge/renesas,lvds.yaml
  F:    Documentation/devicetree/bindings/display/renesas,du.yaml
- F:    drivers/gpu/drm/renesas/
+ F:    drivers/gpu/drm/renesas/rcar-du/
+ 
+ DRM DRIVERS FOR RENESAS SHMOBILE
+ M:    Laurent Pinchart <[email protected]>
+ M:    Geert Uytterhoeven <[email protected]>
+ L:    [email protected]
+ L:    [email protected]
+ S:    Supported
+ F:    Documentation/devicetree/bindings/display/renesas,shmobile-lcdc.yaml
+ F:    drivers/gpu/drm/renesas/shmobile/
  F:    include/linux/platform_data/shmob_drm.h
  
  DRM DRIVERS FOR ROCKCHIP
@@@ -7074,7 -7046,6 +7083,7 @@@ L:      [email protected]
  S:    Maintained
  T:    git git://anongit.freedesktop.org/drm/drm-misc
  F:    Documentation/devicetree/bindings/display/rockchip/
 +F:    drivers/gpu/drm/ci/xfails/rockchip*
  F:    drivers/gpu/drm/rockchip/
  
  DRM DRIVERS FOR STI
@@@ -7171,7 -7142,7 +7180,7 @@@ F:      Documentation/devicetree/bindings/di
  F:    drivers/gpu/drm/xlnx/
  
  DRM GPU SCHEDULER
 -M:    Luben Tuikov <luben.tuikov@amd.com>
 +M:    Luben Tuikov <ltuikov89@gmail.com>
  L:    [email protected]
  S:    Maintained
  T:    git git://anongit.freedesktop.org/drm/drm-misc
@@@ -8136,7 -8107,7 +8145,7 @@@ F:      include/linux/arm_ffa.
  
  FIRMWARE LOADER (request_firmware)
  M:    Luis Chamberlain <[email protected]>
 -M:    Russ Weight <russ[email protected]>
 +M:    Russ Weight <russ[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    Documentation/firmware_class/
@@@ -8917,7 -8888,7 +8926,7 @@@ F:      drivers/gpio/gpio-mockup.
  F:    tools/testing/selftests/gpio/
  
  GPIO REGMAP
 -R:    Michael Walle <[email protected]>
 +M:    Michael Walle <[email protected]>
  S:    Maintained
  F:    drivers/gpio/gpio-regmap.c
  F:    include/linux/gpio/regmap.h
@@@ -9109,7 -9080,6 +9118,7 @@@ T:      git https://git.kernel.org/pub/scm/l
  F:    Documentation/ABI/testing/debugfs-driver-habanalabs
  F:    Documentation/ABI/testing/sysfs-driver-habanalabs
  F:    drivers/accel/habanalabs/
 +F:    include/linux/habanalabs/
  F:    include/trace/events/habanalabs.h
  F:    include/uapi/drm/habanalabs_accel.h
  
@@@ -9575,8 -9545,10 +9584,8 @@@ F:     Documentation/devicetree/bindings/ii
  F:    drivers/iio/pressure/mprls0025pa.c
  
  HOST AP DRIVER
 -M:    Jouni Malinen <[email protected]>
  L:    [email protected]
  S:    Obsolete
 -W:    http://w1.fi/hostap-driver.html
  F:    drivers/net/wireless/intersil/hostap/
  
  HP BIOSCFG DRIVER
@@@ -10517,7 -10489,6 +10526,7 @@@ C:   irc://irc.oftc.net/intel-gf
  T:    git git://anongit.freedesktop.org/drm-intel
  F:    Documentation/ABI/testing/sysfs-driver-intel-i915-hwmon
  F:    Documentation/gpu/i915.rst
 +F:    drivers/gpu/drm/ci/xfails/i915*
  F:    drivers/gpu/drm/i915/
  F:    include/drm/i915*
  F:    include/uapi/drm/i915_drm.h
@@@ -10665,6 -10636,22 +10674,6 @@@ L:  [email protected]
  S:    Maintained
  F:    drivers/crypto/intel/ixp4xx/ixp4xx_crypto.c
  
 -INTEL IXP4XX QMGR, NPE, ETHERNET and HSS SUPPORT
 -M:    Krzysztof Halasa <[email protected]>
 -S:    Maintained
 -F:    drivers/net/ethernet/xscale/ixp4xx_eth.c
 -F:    drivers/net/wan/ixp4xx_hss.c
 -F:    drivers/soc/ixp4xx/ixp4xx-npe.c
 -F:    drivers/soc/ixp4xx/ixp4xx-qmgr.c
 -F:    include/linux/soc/ixp4xx/npe.h
 -F:    include/linux/soc/ixp4xx/qmgr.h
 -
 -INTEL IXP4XX RANDOM NUMBER GENERATOR SUPPORT
 -M:    Deepak Saxena <[email protected]>
 -S:    Maintained
 -F:    Documentation/devicetree/bindings/rng/intel,ixp46x-rng.yaml
 -F:    drivers/char/hw_random/ixp4xx-rng.c
 -
  INTEL KEEM BAY DRM DRIVER
  M:    Anitha Chrisanthus <[email protected]>
  M:    Edmund Dea <[email protected]>
@@@ -11090,7 -11077,7 +11099,7 @@@ F:   Documentation/devicetree/bindings/so
  F:    sound/soc/codecs/sma*
  
  IRQ DOMAINS (IRQ NUMBER MAPPING LIBRARY)
 -M:    Marc Zyngier <[email protected]>
 +M:    Thomas Gleixner <[email protected]>
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git irq/core
  F:    Documentation/core-api/irq/irq-domain.rst
@@@ -11109,6 -11096,7 +11118,6 @@@ F:   lib/group_cpus.
  
  IRQCHIP DRIVERS
  M:    Thomas Gleixner <[email protected]>
 -M:    Marc Zyngier <[email protected]>
  L:    [email protected]
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git irq/core
@@@ -13550,7 -13538,7 +13559,7 @@@ F:   drivers/usb/mtu3
  
  MEGACHIPS STDPXXXX-GE-B850V3-FW LVDS/DP++ BRIDGES
  M:    Peter Senna Tschudin <[email protected]>
 -M:    Martin Donnelly <martin.donnell[email protected]>
 +M:    Ian Ray <ian.ra[email protected]>
  M:    Martyn Welch <[email protected]>
  S:    Maintained
  F:    Documentation/devicetree/bindings/display/bridge/megachips-stdpxxxx-ge-b850v3-fw.txt
@@@ -13642,7 -13630,6 +13651,7 @@@ F:   drivers/net/ethernet/mellanox/mlxfw
  
  MELLANOX HARDWARE PLATFORM SUPPORT
  M:    Hans de Goede <[email protected]>
 +M:    Ilpo Järvinen <[email protected]>
  M:    Mark Gross <[email protected]>
  M:    Vadim Pasternak <[email protected]>
  L:    [email protected]
@@@ -14237,7 -14224,6 +14246,7 @@@ F:   drivers/platform/surface/surface_gpe
  
  MICROSOFT SURFACE HARDWARE PLATFORM SUPPORT
  M:    Hans de Goede <[email protected]>
 +M:    Ilpo Järvinen <[email protected]>
  M:    Mark Gross <[email protected]>
  M:    Maximilian Luz <[email protected]>
  L:    [email protected]
@@@ -14784,7 -14770,7 +14793,7 @@@ NETROM NETWORK LAYE
  M:    Ralf Baechle <[email protected]>
  L:    [email protected]
  S:    Maintained
 -W:    http://www.linux-ax25.org/
 +W:    https://linux-ax25.in-berlin.de
  F:    include/net/netrom.h
  F:    include/uapi/linux/netrom.h
  F:    net/netrom/
@@@ -14973,7 -14959,7 +14982,7 @@@ K:   macse
  K:    \bmdo_
  
  NETWORKING [MPTCP]
 -M:    Matthieu Baerts <matt[email protected]>
 +M:    Matthieu Baerts <matt[email protected]>
  M:    Mat Martineau <[email protected]>
  L:    [email protected]
  L:    [email protected]
@@@ -15378,7 -15364,6 +15387,7 @@@ M:   Laurentiu Palcu <laurentiu.palcu@oss
  R:    Lucas Stach <[email protected]>
  L:    [email protected]
  S:    Maintained
 +T:    git git://anongit.freedesktop.org/drm/drm-misc
  F:    Documentation/devicetree/bindings/display/imx/nxp,imx8mq-dcss.yaml
  F:    drivers/gpu/drm/imx/dcss/
  
@@@ -17629,7 -17614,6 +17638,7 @@@ M:   Kalle Valo <[email protected]
  M:    Jeff Johnson <[email protected]>
  L:    [email protected]
  S:    Supported
 +W:    https://wireless.wiki.kernel.org/en/users/Drivers/ath12k
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git
  F:    drivers/net/wireless/ath/ath12k/
  
@@@ -17891,7 -17875,6 +17900,7 @@@ C:   irc://irc.oftc.net/radeo
  T:    git https://gitlab.freedesktop.org/agd5f/linux.git
  F:    Documentation/gpu/amdgpu/
  F:    drivers/gpu/drm/amd/
 +F:    drivers/gpu/drm/ci/xfails/amd*
  F:    drivers/gpu/drm/radeon/
  F:    include/uapi/drm/amdgpu_drm.h
  F:    include/uapi/drm/radeon_drm.h
@@@ -18161,6 -18144,8 +18170,6 @@@ REALTEK WIRELESS DRIVER (rtlwifi family
  M:    Ping-Ke Shih <[email protected]>
  L:    [email protected]
  S:    Maintained
 -W:    https://wireless.wiki.kernel.org/
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-testing.git
  F:    drivers/net/wireless/realtek/rtlwifi/
  
  REALTEK WIRELESS DRIVER (rtw88)
@@@ -18636,7 -18621,7 +18645,7 @@@ ROSE NETWORK LAYE
  M:    Ralf Baechle <[email protected]>
  L:    [email protected]
  S:    Maintained
 -W:    http://www.linux-ax25.org/
 +W:    https://linux-ax25.in-berlin.de
  F:    include/net/rose.h
  F:    include/uapi/linux/rose.h
  F:    net/rose/
@@@ -18688,6 -18673,7 +18697,6 @@@ F:   drivers/media/dvb-frontends/rtl2832_
  RTL8180 WIRELESS DRIVER
  L:    [email protected]
  S:    Orphan
 -W:    https://wireless.wiki.kernel.org/
  F:    drivers/net/wireless/realtek/rtl818x/rtl8180/
  
  RTL8187 WIRELESS DRIVER
@@@ -18695,12 -18681,14 +18704,12 @@@ M:        Hin-Tak Leung <[email protected]
  M:    Larry Finger <[email protected]>
  L:    [email protected]
  S:    Maintained
 -W:    https://wireless.wiki.kernel.org/
  F:    drivers/net/wireless/realtek/rtl818x/rtl8187/
  
  RTL8XXXU WIRELESS DRIVER (rtl8xxxu)
  M:    Jes Sorensen <[email protected]>
  L:    [email protected]
  S:    Maintained
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jes/linux.git rtl8xxxu-devel
  F:    drivers/net/wireless/realtek/rtl8xxxu/
  
  RTRS TRANSPORT DRIVERS
@@@ -20514,7 -20502,6 +20523,7 @@@ F:   include/dt-bindings/clock/starfive?j
  STARFIVE JH71X0 PINCTRL DRIVERS
  M:    Emil Renner Berthing <[email protected]>
  M:    Jianlong Huang <[email protected]>
 +M:    Hal Feng <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    Documentation/devicetree/bindings/pinctrl/starfive,jh71*.yaml
@@@ -21683,6 -21670,7 +21692,6 @@@ L:   [email protected]
  S:    Orphan
  W:    https://wireless.wiki.kernel.org/en/users/Drivers/wl12xx
  W:    https://wireless.wiki.kernel.org/en/users/Drivers/wl1251
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/luca/wl12xx.git
  F:    drivers/net/wireless/ti/
  
  TIMEKEEPING, CLOCKSOURCE CORE, NTP, ALARMTIMER
@@@ -22871,7 -22859,6 +22880,7 @@@ L:   [email protected]
  L:    [email protected]
  S:    Maintained
  T:    git git://anongit.freedesktop.org/drm/drm-misc
 +F:    drivers/gpu/drm/ci/xfails/virtio*
  F:    drivers/gpu/drm/virtio/
  F:    include/uapi/linux/virtio_gpu.h
  
@@@ -23450,11 -23437,9 +23459,11 @@@ F: drivers/platform/x86/x86-android-tab
  
  X86 PLATFORM DRIVERS
  M:    Hans de Goede <[email protected]>
 +M:    Ilpo Järvinen <[email protected]>
  M:    Mark Gross <[email protected]>
  L:    [email protected]
  S:    Maintained
 +Q:    https://patchwork.kernel.org/project/platform-driver-x86/list/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git
  F:    drivers/platform/olpc/
  F:    drivers/platform/x86/