drm/edid/firmware: Add built-in edid/1280x720.bin firmware
[platform/kernel/linux-starfive.git] / MAINTAINERS
index 7f1b6a0..6958b15 100644 (file)
@@ -3444,7 +3444,7 @@ F:        drivers/net/ieee802154/atusb.h
 AUDIT SUBSYSTEM
 M:     Paul Moore <paul@paul-moore.com>
 M:     Eric Paris <eparis@redhat.com>
-L:     linux-audit@redhat.com (moderated for non-subscribers)
+L:     audit@vger.kernel.org
 S:     Supported
 W:     https://github.com/linux-audit
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/audit.git
@@ -4101,6 +4101,7 @@ N:        bcm7038
 N:     bcm7120
 
 BROADCOM BDC DRIVER
+M:     Justin Chen <justinpopo6@gmail.com>
 M:     Al Cooper <alcooperx@gmail.com>
 L:     linux-usb@vger.kernel.org
 R:     Broadcom internal kernel review list <bcm-kernel-feedback-list@broadcom.com>
@@ -4207,6 +4208,7 @@ F:        Documentation/devicetree/bindings/serial/brcm,bcm7271-uart.yaml
 F:     drivers/tty/serial/8250/8250_bcm7271.c
 
 BROADCOM BRCMSTB USB EHCI DRIVER
+M:     Justin Chen <justinpopo6@gmail.com>
 M:     Al Cooper <alcooperx@gmail.com>
 R:     Broadcom internal kernel review list <bcm-kernel-feedback-list@broadcom.com>
 L:     linux-usb@vger.kernel.org
@@ -4223,6 +4225,7 @@ F:        Documentation/devicetree/bindings/usb/brcm,usb-pinmap.yaml
 F:     drivers/usb/misc/brcmstb-usb-pinmap.c
 
 BROADCOM BRCMSTB USB2 and USB3 PHY DRIVER
+M:     Justin Chen <justinpopo6@gmail.com>
 M:     Al Cooper <alcooperx@gmail.com>
 R:     Broadcom internal kernel review list <bcm-kernel-feedback-list@broadcom.com>
 L:     linux-kernel@vger.kernel.org
@@ -4559,6 +4562,7 @@ M:        Maxime Ripard <mripard@kernel.org>
 L:     linux-media@vger.kernel.org
 S:     Maintained
 F:     Documentation/devicetree/bindings/media/cdns,*.txt
+F:     Documentation/devicetree/bindings/media/cdns,csi2rx.yaml
 F:     drivers/media/platform/cadence/cdns-csi2*
 
 CADENCE NAND DRIVER
@@ -4806,7 +4810,7 @@ R:        Jeff Layton <jlayton@kernel.org>
 L:     ceph-devel@vger.kernel.org
 S:     Supported
 W:     http://ceph.com/
-T:     git git://github.com/ceph/ceph-client.git
+T:     git https://github.com/ceph/ceph-client.git
 F:     include/linux/ceph/
 F:     include/linux/crush/
 F:     net/ceph/
@@ -4818,7 +4822,7 @@ R:        Jeff Layton <jlayton@kernel.org>
 L:     ceph-devel@vger.kernel.org
 S:     Supported
 W:     http://ceph.com/
-T:     git git://github.com/ceph/ceph-client.git
+T:     git https://github.com/ceph/ceph-client.git
 F:     Documentation/filesystems/ceph.rst
 F:     fs/ceph/
 
@@ -4908,7 +4912,7 @@ F:        drivers/platform/chrome/
 
 CHROMEOS EC CODEC DRIVER
 M:     Cheng-Yi Chiang <cychiang@chromium.org>
-M:     Tzung-Bi Shih <tzungbi@google.com>
+M:     Tzung-Bi Shih <tzungbi@kernel.org>
 R:     Guenter Roeck <groeck@chromium.org>
 L:     chrome-platform@lists.linux.dev
 S:     Maintained
@@ -5038,7 +5042,7 @@ F:        drivers/scsi/snic/
 
 CISCO VIC ETHERNET NIC DRIVER
 M:     Christian Benvenuti <benve@cisco.com>
-M:     Govindarajulu Varadarajan <_govind@gmx.com>
+M:     Satish Kharat <satishkh@cisco.com>
 S:     Supported
 F:     drivers/net/ethernet/cisco/enic/
 
@@ -5137,7 +5141,7 @@ M:        Philipp Zabel <p.zabel@pengutronix.de>
 L:     linux-media@vger.kernel.org
 S:     Maintained
 F:     Documentation/devicetree/bindings/media/coda.yaml
-F:     drivers/media/platform/chips-media/
+F:     drivers/media/platform/chips-media/coda
 
 CODE OF CONDUCT
 M:     Greg Kroah-Hartman <gregkh@linuxfoundation.org>
@@ -5180,8 +5184,8 @@ S:        Supported
 W:     https://wiki.samba.org/index.php/LinuxCIFS
 T:     git git://git.samba.org/sfrench/cifs-2.6.git
 F:     Documentation/admin-guide/cifs/
-F:     fs/cifs/
-F:     fs/smbfs_common/
+F:     fs/smb/client/
+F:     fs/smb/common/
 F:     include/uapi/linux/cifs
 
 COMPACTPCI HOTPLUG CORE
@@ -5296,7 +5300,7 @@ M:        Johannes Weiner <hannes@cmpxchg.org>
 M:     Michal Hocko <mhocko@kernel.org>
 M:     Roman Gushchin <roman.gushchin@linux.dev>
 M:     Shakeel Butt <shakeelb@google.com>
-R:     Muchun Song <songmuchun@bytedance.com>
+R:     Muchun Song <muchun.song@linux.dev>
 L:     cgroups@vger.kernel.org
 L:     linux-mm@kvack.org
 S:     Maintained
@@ -5582,8 +5586,6 @@ F:        drivers/scsi/cxgbi/cxgb3i
 
 CXGB4 CRYPTO DRIVER (chcr)
 M:     Ayush Sawal <ayush.sawal@chelsio.com>
-M:     Vinay Kumar Yadav <vinay.yadav@chelsio.com>
-M:     Rohit Maheshwari <rohitm@chelsio.com>
 L:     linux-crypto@vger.kernel.org
 S:     Supported
 W:     http://www.chelsio.com
@@ -5591,8 +5593,6 @@ F:        drivers/crypto/chelsio
 
 CXGB4 INLINE CRYPTO DRIVER
 M:     Ayush Sawal <ayush.sawal@chelsio.com>
-M:     Vinay Kumar Yadav <vinay.yadav@chelsio.com>
-M:     Rohit Maheshwari <rohitm@chelsio.com>
 L:     netdev@vger.kernel.org
 S:     Supported
 W:     http://www.chelsio.com
@@ -7054,6 +7054,15 @@ F:       Documentation/devicetree/bindings/display/brcm,bcm2835-*.yaml
 F:     drivers/gpu/drm/vc4/
 F:     include/uapi/drm/vc4_drm.h
 
+DRM DRIVERS FOR VERISILICON
+M:     Keith Zhao <keith.zhao@starfivetech.com>
+L:     dri-devel@lists.freedesktop.org
+S:     Maintained
+T:     git git://anongit.freedesktop.org/drm/drm-misc
+F:     Documentation/devicetree/bindings/display/verisilicon/
+F:     drivers/gpu/drm/verisilicon/
+F:     include/uapi/drm/vs_drm.h
+
 DRM DRIVERS FOR VIVANTE GPU IP
 M:     Lucas Stach <l.stach@pengutronix.de>
 R:     Russell King <linux+etnaviv@armlinux.org.uk>
@@ -8599,8 +8608,8 @@ F:        include/asm-generic/
 F:     include/uapi/asm-generic/
 
 GENERIC PHY FRAMEWORK
-M:     Kishon Vijay Abraham I <kishon@ti.com>
 M:     Vinod Koul <vkoul@kernel.org>
+M:     Kishon Vijay Abraham I <kishon@kernel.org>
 L:     linux-phy@lists.infradead.org
 S:     Supported
 Q:     https://patchwork.kernel.org/project/linux-phy/list/
@@ -9338,7 +9347,7 @@ S:        Maintained
 F:     drivers/crypto/hisilicon/trng/trng.c
 
 HISILICON V3XX SPI NOR FLASH Controller Driver
-M:     John Garry <john.garry@huawei.com>
+M:     Jay Fang <f.fangjian@huawei.com>
 S:     Maintained
 W:     http://www.hisilicon.com
 F:     drivers/spi/spi-hisi-sfc-v3xx.c
@@ -9363,7 +9372,7 @@ F:        drivers/net/wireless/intersil/hostap/
 HP COMPAQ TC1100 TABLET WMI EXTRAS DRIVER
 L:     platform-driver-x86@vger.kernel.org
 S:     Orphan
-F:     drivers/platform/x86/tc1100-wmi.c
+F:     drivers/platform/x86/hp/tc1100-wmi.c
 
 HPET:  High Precision Event Timers driver
 M:     Clemens Ladisch <clemens@ladisch.de>
@@ -9440,7 +9449,7 @@ F:        drivers/net/ethernet/huawei/hinic/
 
 HUGETLB SUBSYSTEM
 M:     Mike Kravetz <mike.kravetz@oracle.com>
-M:     Muchun Song <songmuchun@bytedance.com>
+M:     Muchun Song <muchun.song@linux.dev>
 L:     linux-mm@kvack.org
 S:     Maintained
 F:     Documentation/ABI/testing/sysfs-kernel-mm-hugepages
@@ -9504,7 +9513,6 @@ F:        drivers/media/i2c/hi847.c
 Hyper-V/Azure CORE AND DRIVERS
 M:     "K. Y. Srinivasan" <kys@microsoft.com>
 M:     Haiyang Zhang <haiyangz@microsoft.com>
-M:     Stephen Hemminger <sthemmin@microsoft.com>
 M:     Wei Liu <wei.liu@kernel.org>
 M:     Dexuan Cui <decui@microsoft.com>
 L:     linux-hyperv@vger.kernel.org
@@ -9775,7 +9783,10 @@ S:       Supported
 F:     drivers/pci/hotplug/rpaphp*
 
 IBM Power SRIOV Virtual NIC Device Driver
-M:     Dany Madden <drt@linux.ibm.com>
+M:     Haren Myneni <haren@linux.ibm.com>
+M:     Rick Lindsley <ricklind@linux.ibm.com>
+R:     Nick Child <nnac123@linux.ibm.com>
+R:     Dany Madden <danymadden@us.ibm.com>
 R:     Thomas Falcon <tlfalcon@linux.ibm.com>
 L:     netdev@vger.kernel.org
 S:     Supported
@@ -10282,7 +10293,7 @@ T:      git https://github.com/intel/gvt-linux.git
 F:     drivers/gpu/drm/i915/gvt/
 
 INTEL HID EVENT DRIVER
-M:     Alex Hung <alex.hung@canonical.com>
+M:     Alex Hung <alexhung@gmail.com>
 L:     platform-driver-x86@vger.kernel.org
 S:     Maintained
 F:     drivers/platform/x86/intel/hid.c
@@ -11030,6 +11041,7 @@ KCONFIG
 M:     Masahiro Yamada <masahiroy@kernel.org>
 L:     linux-kbuild@vger.kernel.org
 S:     Maintained
+Q:     https://patchwork.kernel.org/project/linux-kbuild/list/
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git kconfig
 F:     Documentation/kbuild/kconfig*
 F:     scripts/Kconfig.include
@@ -11087,10 +11099,12 @@ F:    fs/autofs/
 
 KERNEL BUILD + files below scripts/ (unless maintained elsewhere)
 M:     Masahiro Yamada <masahiroy@kernel.org>
-M:     Michal Marek <michal.lkml@markovi.net>
+R:     Nathan Chancellor <nathan@kernel.org>
 R:     Nick Desaulniers <ndesaulniers@google.com>
+R:     Nicolas Schier <nicolas@fjasle.eu>
 L:     linux-kbuild@vger.kernel.org
 S:     Maintained
+Q:     https://patchwork.kernel.org/project/linux-kbuild/list/
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git
 F:     Documentation/kbuild/
 F:     Makefile
@@ -11108,6 +11122,8 @@ M:      Kees Cook <keescook@chromium.org>
 L:     linux-hardening@vger.kernel.org
 S:     Supported
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git for-next/hardening
+F:     Documentation/ABI/testing/sysfs-kernel-oops_count
+F:     Documentation/ABI/testing/sysfs-kernel-warn_count
 F:     include/linux/overflow.h
 F:     include/linux/randomize_kstack.h
 F:     mm/usercopy.c
@@ -11162,8 +11178,8 @@ L:      linux-cifs@vger.kernel.org
 S:     Maintained
 T:     git git://git.samba.org/ksmbd.git
 F:     Documentation/filesystems/cifs/ksmbd.rst
-F:     fs/ksmbd/
-F:     fs/smbfs_common/
+F:     fs/smb/common/
+F:     fs/smb/server/
 
 KERNEL UNIT TESTING FRAMEWORK (KUnit)
 M:     Brendan Higgins <brendanhiggins@google.com>
@@ -11245,7 +11261,7 @@ L:      kvm@vger.kernel.org
 L:     kvm-riscv@lists.infradead.org
 L:     linux-riscv@lists.infradead.org
 S:     Maintained
-T:     git git://github.com/kvm-riscv/linux.git
+T:     git https://github.com/kvm-riscv/linux.git
 F:     arch/riscv/include/asm/kvm*
 F:     arch/riscv/include/uapi/asm/kvm*
 F:     arch/riscv/kvm/
@@ -11258,7 +11274,6 @@ M:      Claudio Imbrenda <imbrenda@linux.ibm.com>
 R:     David Hildenbrand <david@redhat.com>
 L:     kvm@vger.kernel.org
 S:     Supported
-W:     http://www.ibm.com/developerworks/linux/linux390/
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git
 F:     Documentation/virt/kvm/s390*
 F:     arch/s390/include/asm/gmap.h
@@ -11853,7 +11868,7 @@ M:      Eric Piel <eric.piel@tremplin-utc.net>
 S:     Maintained
 F:     Documentation/misc-devices/lis3lv02d.rst
 F:     drivers/misc/lis3lv02d/
-F:     drivers/platform/x86/hp_accel.c
+F:     drivers/platform/x86/hp/hp_accel.c
 
 LIST KUNIT TEST
 M:     David Gow <davidgow@google.com>
@@ -12221,7 +12236,6 @@ F:      arch/mips/boot/dts/img/pistachio*
 
 MARVELL 88E6XXX ETHERNET SWITCH FABRIC DRIVER
 M:     Andrew Lunn <andrew@lunn.ch>
-M:     Vivien Didelot <vivien.didelot@gmail.com>
 L:     netdev@vger.kernel.org
 S:     Maintained
 F:     Documentation/devicetree/bindings/net/dsa/marvell.txt
@@ -13947,6 +13961,7 @@ F:      include/uapi/linux/meye.h
 
 MOTORCOMM PHY DRIVER
 M:     Peter Geis <pgwipeout@gmail.com>
+M:     Frank <Frank.Sae@motor-comm.com>
 L:     netdev@vger.kernel.org
 S:     Maintained
 F:     drivers/net/phy/motorcomm.c
@@ -14325,7 +14340,6 @@ F:      drivers/net/wireless/
 
 NETWORKING [DSA]
 M:     Andrew Lunn <andrew@lunn.ch>
-M:     Vivien Didelot <vivien.didelot@gmail.com>
 M:     Florian Fainelli <f.fainelli@gmail.com>
 M:     Vladimir Oltean <olteanv@gmail.com>
 S:     Maintained
@@ -14530,7 +14544,7 @@ L:      linux-nilfs@vger.kernel.org
 S:     Supported
 W:     https://nilfs.sourceforge.io/
 W:     https://nilfs.osdn.jp/
-T:     git git://github.com/konis/nilfs2.git
+T:     git https://github.com/konis/nilfs2.git
 F:     Documentation/filesystems/nilfs2.rst
 F:     fs/nilfs2/
 F:     include/trace/events/nilfs2.h
@@ -15442,6 +15456,7 @@ S:      Maintained
 W:     http://openvswitch.org
 F:     include/uapi/linux/openvswitch.h
 F:     net/openvswitch/
+F:     tools/testing/selftests/net/openvswitch/
 
 OPERATING PERFORMANCE POINTS (OPP)
 M:     Viresh Kumar <vireshk@kernel.org>
@@ -15633,7 +15648,7 @@ F:      drivers/input/serio/gscps2.c
 F:     drivers/input/serio/hp_sdc*
 F:     drivers/parisc/
 F:     drivers/parport/parport_gsc.*
-F:     drivers/tty/serial/8250/8250_gsc.c
+F:     drivers/tty/serial/8250/8250_parisc.c
 F:     drivers/video/console/sti*
 F:     drivers/video/fbdev/sti*
 F:     drivers/video/logo/logo_parisc*
@@ -15946,6 +15961,7 @@ Q:      https://patchwork.kernel.org/project/linux-pci/list/
 B:     https://bugzilla.kernel.org
 C:     irc://irc.oftc.net/linux-pci
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/lpieralisi/pci.git
+F:     Documentation/devicetree/bindings/pci/
 F:     drivers/pci/controller/
 F:     drivers/pci/pci-bridge-emul.c
 F:     drivers/pci/pci-bridge-emul.h
@@ -16052,7 +16068,7 @@ F:      Documentation/devicetree/bindings/pci/microchip*
 F:     drivers/pci/controller/*microchip*
 
 PCIE DRIVER FOR QUALCOMM MSM
-M:     Stanimir Varbanov <svarbanov@mm-sol.com>
+M:     Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
 L:     linux-pci@vger.kernel.org
 L:     linux-arm-msm@vger.kernel.org
 S:     Maintained
@@ -16142,7 +16158,8 @@ F:      include/linux/peci-cpu.h
 F:     include/linux/peci.h
 
 PENSANDO ETHERNET DRIVERS
-M:     Shannon Nelson <snelson@pensando.io>
+M:     Shannon Nelson <shannon.nelson@amd.com>
+M:     Brett Creeley <brett.creeley@amd.com>
 M:     drivers@pensando.io
 L:     netdev@vger.kernel.org
 S:     Supported
@@ -16681,6 +16698,7 @@ F:      Documentation/driver-api/ptp.rst
 F:     drivers/net/phy/dp83640*
 F:     drivers/ptp/*
 F:     include/linux/ptp_cl*
+K:     (?:\b|_)ptp(?:\b|_)
 
 PTP VIRTUAL CLOCK SUPPORT
 M:     Yangbo Lu <yangbo.lu@nxp.com>
@@ -17224,7 +17242,7 @@ R:      Dongsheng Yang <dongsheng.yang@easystack.cn>
 L:     ceph-devel@vger.kernel.org
 S:     Supported
 W:     http://ceph.com/
-T:     git git://github.com/ceph/ceph-client.git
+T:     git https://github.com/ceph/ceph-client.git
 F:     Documentation/ABI/testing/sysfs-bus-rbd
 F:     drivers/block/rbd.c
 F:     drivers/block/rbd_types.h
@@ -17477,10 +17495,8 @@ S:     Maintained
 F:     drivers/net/wireless/realtek/rtw89/
 
 REDPINE WIRELESS DRIVER
-M:     Amitkumar Karwar <amitkarwar@gmail.com>
-M:     Siva Rebbagondla <siva8118@gmail.com>
 L:     linux-wireless@vger.kernel.org
-S:     Maintained
+S:     Orphan
 F:     drivers/net/wireless/rsi/
 
 REGISTER MAP ABSTRACTION
@@ -17826,7 +17842,7 @@ S:      Odd Fixes
 F:     drivers/tty/serial/rp2.*
 
 ROHM BD99954 CHARGER IC
-R:     Matti Vaittinen <mazziesaccount@gmail.com>
+M:     Matti Vaittinen <mazziesaccount@gmail.com>
 S:     Supported
 F:     drivers/power/supply/bd99954-charger.c
 F:     drivers/power/supply/bd99954-charger.h
@@ -17849,7 +17865,7 @@ F:      drivers/regulator/bd9571mwv-regulator.c
 F:     include/linux/mfd/bd9571mwv.h
 
 ROHM POWER MANAGEMENT IC DEVICE DRIVERS
-R:     Matti Vaittinen <mazziesaccount@gmail.com>
+M:     Matti Vaittinen <mazziesaccount@gmail.com>
 S:     Supported
 F:     drivers/clk/clk-bd718x7.c
 F:     drivers/gpio/gpio-bd71815.c
@@ -18003,7 +18019,7 @@ L:      linux-fbdev@vger.kernel.org
 S:     Maintained
 F:     drivers/video/fbdev/savage/
 
-S390
+S390 ARCHITECTURE
 M:     Heiko Carstens <hca@linux.ibm.com>
 M:     Vasily Gorbik <gor@linux.ibm.com>
 M:     Alexander Gordeev <agordeev@linux.ibm.com>
@@ -18011,7 +18027,6 @@ R:      Christian Borntraeger <borntraeger@linux.ibm.com>
 R:     Sven Schnelle <svens@linux.ibm.com>
 L:     linux-s390@vger.kernel.org
 S:     Supported
-W:     http://www.ibm.com/developerworks/linux/linux390/
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git
 F:     Documentation/driver-api/s390-drivers.rst
 F:     Documentation/s390/
@@ -18023,7 +18038,6 @@ M:      Vineeth Vijayan <vneethv@linux.ibm.com>
 M:     Peter Oberparleiter <oberpar@linux.ibm.com>
 L:     linux-s390@vger.kernel.org
 S:     Supported
-W:     http://www.ibm.com/developerworks/linux/linux390/
 F:     drivers/s390/cio/
 
 S390 DASD DRIVER
@@ -18031,7 +18045,6 @@ M:      Stefan Haberland <sth@linux.ibm.com>
 M:     Jan Hoeppner <hoeppner@linux.ibm.com>
 L:     linux-s390@vger.kernel.org
 S:     Supported
-W:     http://www.ibm.com/developerworks/linux/linux390/
 F:     block/partitions/ibm.c
 F:     drivers/s390/block/dasd*
 F:     include/linux/dasd_mod.h
@@ -18041,7 +18054,6 @@ M:      Matthew Rosato <mjrosato@linux.ibm.com>
 M:     Gerald Schaefer <gerald.schaefer@linux.ibm.com>
 L:     linux-s390@vger.kernel.org
 S:     Supported
-W:     http://www.ibm.com/developerworks/linux/linux390/
 F:     drivers/iommu/s390-iommu.c
 
 S390 IUCV NETWORK LAYER
@@ -18050,7 +18062,6 @@ M:      Wenjia Zhang <wenjia@linux.ibm.com>
 L:     linux-s390@vger.kernel.org
 L:     netdev@vger.kernel.org
 S:     Supported
-W:     http://www.ibm.com/developerworks/linux/linux390/
 F:     drivers/s390/net/*iucv*
 F:     include/net/iucv/
 F:     net/iucv/
@@ -18061,15 +18072,22 @@ M:    Wenjia Zhang <wenjia@linux.ibm.com>
 L:     linux-s390@vger.kernel.org
 L:     netdev@vger.kernel.org
 S:     Supported
-W:     http://www.ibm.com/developerworks/linux/linux390/
 F:     drivers/s390/net/
 
+S390 MM
+M:     Alexander Gordeev <agordeev@linux.ibm.com>
+M:     Gerald Schaefer <gerald.schaefer@linux.ibm.com>
+L:     linux-s390@vger.kernel.org
+S:     Supported
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git
+F:     arch/s390/include/asm/pgtable.h
+F:     arch/s390/mm
+
 S390 PCI SUBSYSTEM
 M:     Niklas Schnelle <schnelle@linux.ibm.com>
 M:     Gerald Schaefer <gerald.schaefer@linux.ibm.com>
 L:     linux-s390@vger.kernel.org
 S:     Supported
-W:     http://www.ibm.com/developerworks/linux/linux390/
 F:     arch/s390/pci/
 F:     drivers/pci/hotplug/s390_pci_hpc.c
 F:     Documentation/s390/pci.rst
@@ -18080,7 +18098,6 @@ M:      Halil Pasic <pasic@linux.ibm.com>
 M:     Jason Herne <jjherne@linux.ibm.com>
 L:     linux-s390@vger.kernel.org
 S:     Supported
-W:     http://www.ibm.com/developerworks/linux/linux390/
 F:     Documentation/s390/vfio-ap*
 F:     drivers/s390/crypto/vfio_ap*
 
@@ -18109,7 +18126,6 @@ S390 ZCRYPT DRIVER
 M:     Harald Freudenberger <freude@linux.ibm.com>
 L:     linux-s390@vger.kernel.org
 S:     Supported
-W:     http://www.ibm.com/developerworks/linux/linux390/
 F:     drivers/s390/crypto/
 
 S390 ZFCP DRIVER
@@ -18117,7 +18133,6 @@ M:      Steffen Maier <maier@linux.ibm.com>
 M:     Benjamin Block <bblock@linux.ibm.com>
 L:     linux-s390@vger.kernel.org
 S:     Supported
-W:     http://www.ibm.com/developerworks/linux/linux390/
 F:     drivers/s390/scsi/zfcp_*
 
 S3C ADC BATTERY DRIVER
@@ -18659,6 +18674,14 @@ L:     netdev@vger.kernel.org
 S:     Supported
 F:     drivers/net/ethernet/sfc/
 
+SFCTEMP HWMON DRIVER
+M:     Emil Renner Berthing <kernel@esmil.dk>
+L:     linux-hwmon@vger.kernel.org
+S:     Maintained
+F:     Documentation/devicetree/bindings/hwmon/starfive,jh71x0-temp.yaml
+F:     Documentation/hwmon/sfctemp.rst
+F:     drivers/hwmon/sfctemp.c
+
 SFF/SFP/SFP+ MODULE SUPPORT
 M:     Russell King <linux@armlinux.org.uk>
 L:     netdev@vger.kernel.org
@@ -18689,7 +18712,6 @@ M:      Wenjia Zhang <wenjia@linux.ibm.com>
 M:     Jan Karcher <jaka@linux.ibm.com>
 L:     linux-s390@vger.kernel.org
 S:     Supported
-W:     http://www.ibm.com/developerworks/linux/linux390/
 F:     net/smc/
 
 SHARP GP2AP002A00F/GP2AP002S00F SENSOR DRIVER
@@ -19626,32 +19648,126 @@ M:   Ion Badulescu <ionut@badula.org>
 S:     Odd Fixes
 F:     drivers/net/ethernet/adaptec/starfire*
 
+STARFIVE CAMERA SUBSYSTEM DRIVER
+M:     Jack Zhu <jack.zhu@starfivetech.com>
+M:     Changhuang Liang <changhuang.liang@starfivetech.com>
+L:     linux-media@vger.kernel.org
+S:     Maintained
+F:     Documentation/admin-guide/media/starfive_camss.rst
+F:     Documentation/devicetree/bindings/media/starfive,jh7110-camss.yaml
+F:     drivers/media/platform/starfive/
+
+STARFIVE CRYPTO DRIVER
+M:     Jia Jie Ho <jiajie.ho@starfivetech.com>
+M:     William Qiu <william.qiu@starfivetech.com>
+S:     Supported
+F:     Documentation/devicetree/bindings/crypto/starfive*
+F:     drivers/crypto/starfive/
+
 STARFIVE DEVICETREES
 M:     Emil Renner Berthing <kernel@esmil.dk>
 S:     Maintained
 F:     arch/riscv/boot/dts/starfive/
 
-STARFIVE JH7100 CLOCK DRIVERS
+STARFIVE DWMAC GLUE LAYER
+M:     Emil Renner Berthing <kernel@esmil.dk>
+M:     Samin Guo <samin.guo@starfivetech.com>
+S:     Maintained
+F:     Documentation/devicetree/bindings/net/dwmac-starfive.c
+F:     Documentation/devicetree/bindings/net/starfive,jh7110-dwmac.yaml
+
+STARFIVE JH7110 DPHY RX DRIVER
+M:     Jack Zhu <jack.zhu@starfivetech.com>
+M:     Changhuang Liang <changhuang.liang@starfivetech.com>
+S:     Supported
+F:     Documentation/devicetree/bindings/phy/starfive,jh7110-dphy-rx.yaml
+F:     drivers/phy/starfive/phy-starfive-dphy-rx.c
+
+STARFIVE JH7110 MMC/SD/SDIO DRIVER
+M:     William Qiu <william.qiu@starfivetech.com>
+S:     Supported
+F:     Documentation/devicetree/bindings/mmc/starfive*
+F:     drivers/mmc/host/dw_mmc-starfive.c
+
+STARFIVE JH7110 SYSCON
+M:     William Qiu <william.qiu@starfivetech.com>
+S:     Supported
+F:     Documentation/devicetree/bindings/soc/starfive/starfive,jh7110-syscon.yaml
+
+STARFIVE JH71X0 CLOCK DRIVERS
 M:     Emil Renner Berthing <kernel@esmil.dk>
+M:     Hal Feng <hal.feng@starfivetech.com>
 S:     Maintained
-F:     Documentation/devicetree/bindings/clock/starfive,jh7100-*.yaml
-F:     drivers/clk/starfive/clk-starfive-jh7100*
-F:     include/dt-bindings/clock/starfive-jh7100*.h
+F:     Documentation/devicetree/bindings/clock/starfive,jh71*.yaml
+F:     drivers/clk/starfive/clk-starfive-jh71*
+F:     include/dt-bindings/clock/starfive?jh71*.h
 
-STARFIVE JH7100 PINCTRL DRIVER
+STARFIVE JH71X0 PCIE AND USB PHY DRIVER
 M:     Emil Renner Berthing <kernel@esmil.dk>
+M:     Minda Chen <minda.chen@starfivetech.com>
+S:     Supported
+F:     Documentation/devicetree/bindings/phy/starfive,jh7110-usb-pcie-phy.yaml
+F:     drivers/phy/starfive/phy-jh7110-pcie.c
+F:     drivers/phy/starfive/phy-jh7110-usb.c
+
+STARFIVE JH71X0 PINCTRL DRIVERS
+M:     Emil Renner Berthing <kernel@esmil.dk>
+M:     Jianlong Huang <jianlong.huang@starfivetech.com>
 L:     linux-gpio@vger.kernel.org
 S:     Maintained
-F:     Documentation/devicetree/bindings/pinctrl/starfive,jh7100-pinctrl.yaml
-F:     drivers/pinctrl/starfive/
+F:     Documentation/devicetree/bindings/pinctrl/starfive,jh71*.yaml
+F:     drivers/pinctrl/starfive/pinctrl-starfive-jh71*
 F:     include/dt-bindings/pinctrl/pinctrl-starfive-jh7100.h
+F:     include/dt-bindings/pinctrl/starfive,jh7110-pinctrl.h
 
-STARFIVE JH7100 RESET CONTROLLER DRIVER
+STARFIVE JH71X0 PWM DRIVERS
+M:     William Qiu <william.qiu@starfivetech.com>
+M:     Hal Feng <hal.feng@starfivetech.com>
+S:     Supported
+F:     Documentation/devicetree/bindings/pwm/starfive,jh7110-pwm.yaml
+F:     drivers/pwm/pwm-starfive-ptc.c
+
+STARFIVE JH71X0 RESET CONTROLLER DRIVERS
 M:     Emil Renner Berthing <kernel@esmil.dk>
+M:     Hal Feng <hal.feng@starfivetech.com>
 S:     Maintained
 F:     Documentation/devicetree/bindings/reset/starfive,jh7100-reset.yaml
-F:     drivers/reset/reset-starfive-jh7100.c
-F:     include/dt-bindings/reset/starfive-jh7100.h
+F:     drivers/reset/starfive/reset-starfive-jh71*
+F:     include/dt-bindings/reset/starfive?jh71*.h
+
+STARFIVE JH71X0 USB DRIVERS
+M:     Emil Renner Berthing <kernel@esmil.dk>
+M:     Minda Chen <minda.chen@starfivetech.com>
+S:     Maintained
+F:     Documentation/devicetree/bindings/usb/starfive,jh7110-usb.yaml
+F:     drivers/usb/cdns3/cdns3-starfive.c
+
+STARFIVE JH71XX PMU CONTROLLER DRIVER
+M:     Walker Chen <walker.chen@starfivetech.com>
+S:     Supported
+F:     Documentation/devicetree/bindings/power/starfive*
+F:     drivers/soc/starfive/jh71xx_pmu.c
+F:     include/dt-bindings/power/starfive,jh7110-pmu.h
+
+STARFIVE SOC DRIVERS
+M:     Conor Dooley <conor@kernel.org>
+S:     Maintained
+T:     git https://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git/
+F:     drivers/soc/starfive/
+
+STARFIVE JH71XX PMU CONTROLLER DRIVER
+M:     Walker Chen <walker.chen@starfivetech.com>
+S:     Supported
+F:     Documentation/devicetree/bindings/power/starfive*
+F:     drivers/soc/starfive/jh71xx_pmu.c
+F:     include/dt-bindings/power/starfive,jh7110-pmu.h
+
+STARFIVE WATCHDOG DRIVER
+M:     Xingyu Wu <xingyu.wu@starfivetech.com>
+M:     Samin Guo <samin.guo@starfivetech.com>
+S:     Supported
+F:     Documentation/devicetree/bindings/watchdog/starfive*
+F:     drivers/watchdog/starfive-wdt.c
 
 STATIC BRANCH/CALL
 M:     Peter Zijlstra <peterz@infradead.org>
@@ -21215,15 +21331,6 @@ S:     Maintained
 F:     Documentation/usb/ehci.rst
 F:     drivers/usb/host/ehci*
 
-USB GADGET/PERIPHERAL SUBSYSTEM
-M:     Felipe Balbi <balbi@kernel.org>
-L:     linux-usb@vger.kernel.org
-S:     Maintained
-W:     http://www.linux-usb.org/gadget
-T:     git git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git
-F:     drivers/usb/gadget/
-F:     include/linux/usb/gadget*
-
 USB HID/HIDBP DRIVERS (USB KEYBOARDS, MICE, REMOTE CONTROLS, ...)
 M:     Jiri Kosina <jikos@kernel.org>
 M:     Benjamin Tissoires <benjamin.tissoires@redhat.com>
@@ -21330,13 +21437,6 @@ W:     https://github.com/petkan/pegasus
 T:     git https://github.com/petkan/pegasus.git
 F:     drivers/net/usb/pegasus.*
 
-USB PHY LAYER
-M:     Felipe Balbi <balbi@kernel.org>
-L:     linux-usb@vger.kernel.org
-S:     Maintained
-T:     git git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git
-F:     drivers/usb/phy/
-
 USB PRINTER DRIVER (usblp)
 M:     Pete Zaitcev <zaitcev@redhat.com>
 L:     linux-usb@vger.kernel.org
@@ -22157,6 +22257,15 @@ F:     include/linux/watchdog.h
 F:     include/uapi/linux/watchdog.h
 F:     include/trace/events/watchdog.h
 
+WAVE5 VPU CODEC DRIVER
+M:     Nas Chung <nas.chung@chipsnmedia.com>
+M:     Robert Beckett <bob.beckett@collabora.com>
+M:     Sebastian Fricke <sebastian.fricke@collabora.com>
+L:     linux-media@vger.kernel.org
+S:     Maintained
+F:     Documentation/devicetree/bindings/media/cnm,wave5.yaml
+F:     drivers/media/platform/chips-media/wave5/
+
 WHISKEYCOVE PMIC GPIO DRIVER
 M:     Kuppuswamy Sathyanarayanan <sathyanarayanan.kuppuswamy@linux.intel.com>
 L:     linux-gpio@vger.kernel.org