Merge tag 'pci-v5.18-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaa...
[linux-2.6-microblaze.git] / MAINTAINERS
index 8c317c5..b8d749f 100644 (file)
@@ -389,11 +389,11 @@ L:        linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:     Maintained
 F:     drivers/acpi/arm64
 
-ACPI I2C MULTI INSTANTIATE DRIVER
+ACPI SERIAL MULTI INSTANTIATE DRIVER
 M:     Hans de Goede <hdegoede@redhat.com>
 L:     platform-driver-x86@vger.kernel.org
 S:     Maintained
-F:     drivers/platform/x86/i2c-multi-instantiate.c
+F:     drivers/platform/x86/serial-multi-instantiate.c
 
 ACPI PCC(Platform Communication Channel) MAILBOX DRIVER
 M:     Sudeep Holla <sudeep.holla@arm.com>
@@ -989,6 +989,16 @@ L: platform-driver-x86@vger.kernel.org
 S:     Maintained
 F:     drivers/platform/x86/amd-pmc.*
 
+AMD HSMP DRIVER
+M:     Naveen Krishna Chatradhi <naveenkrishna.chatradhi@amd.com>
+R:     Carlos Bilbao <carlos.bilbao@amd.com>
+L:     platform-driver-x86@vger.kernel.org
+S:     Maintained
+F:     Documentation/x86/amd_hsmp.rst
+F:     arch/x86/include/asm/amd_hsmp.h
+F:     arch/x86/include/uapi/asm/amd_hsmp.h
+F:     drivers/platform/x86/amd_hsmp.c
+
 AMD POWERPLAY AND SWSMU
 M:     Evan Quan <evan.quan@amd.com>
 L:     amd-gfx@lists.freedesktop.org
@@ -1032,6 +1042,15 @@ S:       Maintained
 F:     Documentation/hid/amd-sfh*
 F:     drivers/hid/amd-sfh-hid/
 
+AMPHION VPU CODEC V4L2 DRIVER
+M:     Ming Qian <ming.qian@nxp.com>
+M:     Shijie Qin <shijie.qin@nxp.com>
+M:     Zhou Peng <eagle.zhou@nxp.com>
+L:     linux-media@vger.kernel.org
+S:     Maintained
+F:     Documentation/devicetree/bindings/media/amphion,vpu.yaml
+F:     drivers/media/platform/amphion/
+
 AMS AS73211 DRIVER
 M:     Christian Eggers <ceggers@arri.de>
 L:     linux-iio@vger.kernel.org
@@ -1230,18 +1249,6 @@ S:       Supported
 F:     drivers/clk/analogbits/*
 F:     include/linux/clk/analogbits*
 
-ANDES ARCHITECTURE
-M:     Nick Hu <nickhu@andestech.com>
-M:     Greentime Hu <green.hu@gmail.com>
-M:     Vincent Chen <deanbo422@gmail.com>
-S:     Supported
-T:     git https://git.kernel.org/pub/scm/linux/kernel/git/greentime/linux.git
-F:     Documentation/devicetree/bindings/interrupt-controller/andestech,ativic32.txt
-F:     Documentation/devicetree/bindings/nds32/
-F:     arch/nds32/
-N:     nds32
-K:     nds32
-
 ANDROID CONFIG FRAGMENTS
 M:     Rob Herring <robh@kernel.org>
 S:     Supported
@@ -1688,9 +1695,9 @@ S:        Maintained
 F:     drivers/clk/sunxi/
 
 ARM/Allwinner sunXi SoC support
-M:     Maxime Ripard <mripard@kernel.org>
 M:     Chen-Yu Tsai <wens@csie.org>
-R:     Jernej Skrabec <jernej.skrabec@gmail.com>
+M:     Jernej Skrabec <jernej.skrabec@gmail.com>
+M:     Samuel Holland <samuel@sholland.org>
 L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:     Maintained
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux.git
@@ -2120,13 +2127,6 @@ F:       Documentation/devicetree/bindings/arm/intel,keembay.yaml
 F:     arch/arm64/boot/dts/intel/keembay-evm.dts
 F:     arch/arm64/boot/dts/intel/keembay-soc.dtsi
 
-ARM/INTEL RESEARCH IMOTE/STARGATE 2 MACHINE SUPPORT
-M:     Jonathan Cameron <jic23@cam.ac.uk>
-L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
-S:     Maintained
-F:     arch/arm/mach-pxa/stargate2.c
-F:     drivers/pcmcia/pxa2xx_stargate2.c
-
 ARM/INTEL XSC3 (MANZANO) ARM CORE
 M:     Lennert Buytenhek <kernel@wantstofly.org>
 L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
@@ -2368,6 +2368,7 @@ L:        openbmc@lists.ozlabs.org (moderated for non-subscribers)
 S:     Supported
 F:     Documentation/devicetree/bindings/*/*/*npcm*
 F:     Documentation/devicetree/bindings/*/*npcm*
+F:     Documentation/devicetree/bindings/arm/npcm/*
 F:     arch/arm/boot/dts/nuvoton-npcm*
 F:     arch/arm/mach-npcm/
 F:     drivers/*/*npcm*
@@ -2378,6 +2379,7 @@ ARM/NUVOTON WPCM450 ARCHITECTURE
 M:     Jonathan Neuschäfer <j.neuschaefer@gmx.net>
 L:     openbmc@lists.ozlabs.org (moderated for non-subscribers)
 S:     Maintained
+W:     https://github.com/neuschaefer/wpcm450/wiki
 F:     Documentation/devicetree/bindings/*/*wpcm*
 F:     arch/arm/boot/dts/nuvoton-wpcm450*
 F:     arch/arm/mach-npcm/wpcm450.c
@@ -2532,6 +2534,7 @@ M:        Magnus Damm <magnus.damm@gmail.com>
 L:     linux-renesas-soc@vger.kernel.org
 S:     Supported
 Q:     http://patchwork.kernel.org/project/linux-renesas-soc/list/
+C:     irc://irc.libera.chat/renesas-soc
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel.git next
 F:     Documentation/devicetree/bindings/arm/renesas.yaml
 F:     arch/arm64/boot/dts/renesas/
@@ -2615,7 +2618,7 @@ M:        Łukasz Stelmach <l.stelmach@samsung.com>
 L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 L:     linux-media@vger.kernel.org
 S:     Maintained
-F:     drivers/media/platform/s5p-g2d/
+F:     drivers/media/platform/samsung/s5p-g2d/
 
 ARM/SAMSUNG S5P SERIES HDMI CEC SUBSYSTEM SUPPORT
 M:     Marek Szyprowski <m.szyprowski@samsung.com>
@@ -2632,7 +2635,7 @@ M:        Sylwester Nawrocki <s.nawrocki@samsung.com>
 L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 L:     linux-media@vger.kernel.org
 S:     Maintained
-F:     drivers/media/platform/s5p-jpeg/
+F:     drivers/media/platform/samsung/s5p-jpeg/
 
 ARM/SAMSUNG S5P SERIES Multi Format Codec (MFC) SUPPORT
 M:     Marek Szyprowski <m.szyprowski@samsung.com>
@@ -2640,7 +2643,7 @@ M:        Andrzej Hajda <andrzej.hajda@intel.com>
 L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 L:     linux-media@vger.kernel.org
 S:     Maintained
-F:     drivers/media/platform/s5p-mfc/
+F:     drivers/media/platform/samsung/s5p-mfc/
 
 ARM/SHMOBILE ARM ARCHITECTURE
 M:     Geert Uytterhoeven <geert+renesas@glider.be>
@@ -2648,6 +2651,7 @@ M:        Magnus Damm <magnus.damm@gmail.com>
 L:     linux-renesas-soc@vger.kernel.org
 S:     Supported
 Q:     http://patchwork.kernel.org/project/linux-renesas-soc/list/
+C:     irc://irc.libera.chat/renesas-soc
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel.git next
 F:     Documentation/devicetree/bindings/arm/renesas.yaml
 F:     arch/arm/boot/dts/emev2*
@@ -2709,7 +2713,7 @@ F:        drivers/clocksource/clksrc_st_lpc.c
 F:     drivers/cpufreq/sti-cpufreq.c
 F:     drivers/dma/st_fdma*
 F:     drivers/i2c/busses/i2c-st.c
-F:     drivers/media/platform/sti/c8sectpfe/
+F:     drivers/media/platform/st/sti/c8sectpfe/
 F:     drivers/media/rc/st_rc.c
 F:     drivers/mmc/host/sdhci-st.c
 F:     drivers/phy/st/phy-miphy28lp.c
@@ -2761,6 +2765,14 @@ S:       Maintained
 F:     Documentation/devicetree/bindings/media/tegra-cec.txt
 F:     drivers/media/cec/platform/tegra/
 
+ARM/TESLA FSD SoC SUPPORT
+M:     Alim Akhtar <alim.akhtar@samsung.com>
+M:     linux-fsd@tesla.com
+L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
+L:     linux-samsung-soc@vger.kernel.org
+S:     Maintained
+F:     arch/arm64/boot/dts/tesla*
+
 ARM/TETON BGA MACHINE SUPPORT
 M:     "Mark F. Brown" <mark.brown314@gmail.com>
 L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
@@ -3025,7 +3037,7 @@ L:        linux-media@vger.kernel.org
 L:     openbmc@lists.ozlabs.org (moderated for non-subscribers)
 S:     Maintained
 F:     Documentation/devicetree/bindings/media/aspeed-video.txt
-F:     drivers/media/platform/aspeed-video.c
+F:     drivers/media/platform/aspeed/
 
 ASUS NOTEBOOKS AND EEEPC ACPI/WMI EXTRAS DRIVERS
 M:     Corentin Chary <corentin.chary@gmail.com>
@@ -3387,7 +3399,7 @@ L:        linux-media@vger.kernel.org
 S:     Supported
 W:     https://linuxtv.org
 T:     git git://linuxtv.org/media_tree.git
-F:     drivers/media/platform/sti/bdisp
+F:     drivers/media/platform/st/sti/bdisp
 
 BECKHOFF CX5020 ETHERCAT MASTER DRIVER
 M:     Dariusz Marcinkiewicz <reksio@newterm.pl>
@@ -3536,6 +3548,8 @@ F:        net/sched/act_bpf.c
 F:     net/sched/cls_bpf.c
 F:     samples/bpf/
 F:     scripts/bpf_doc.py
+F:     scripts/pahole-flags.sh
+F:     scripts/pahole-version.sh
 F:     tools/bpf/
 F:     tools/lib/bpf/
 F:     tools/testing/selftests/bpf/
@@ -3828,9 +3842,6 @@ BROADCOM BRCM80211 IEEE802.11n WIRELESS DRIVER
 M:     Arend van Spriel <aspriel@gmail.com>
 M:     Franky Lin <franky.lin@broadcom.com>
 M:     Hante Meuleman <hante.meuleman@broadcom.com>
-M:     Chi-hsien Lin <chi-hsien.lin@infineon.com>
-M:     Wright Feng <wright.feng@infineon.com>
-M:     Chung-hsien Hsu <chung-hsien.hsu@infineon.com>
 L:     linux-wireless@vger.kernel.org
 L:     brcm80211-dev-list.pdl@broadcom.com
 L:     SHA-cyfmac-dev-list@infineon.com
@@ -4252,7 +4263,7 @@ L:        linux-media@vger.kernel.org
 S:     Orphan
 T:     git git://linuxtv.org/media_tree.git
 F:     Documentation/admin-guide/media/cafe_ccic*
-F:     drivers/media/platform/marvell-ccic/
+F:     drivers/media/platform/marvell/
 
 CAIF NETWORK LAYER
 L:     netdev@vger.kernel.org
@@ -4455,6 +4466,7 @@ F:        drivers/power/supply/cw2015_battery.c
 CEPH COMMON CODE (LIBCEPH)
 M:     Ilya Dryomov <idryomov@gmail.com>
 M:     Jeff Layton <jlayton@kernel.org>
+M:     Xiubo Li <xiubli@redhat.com>
 L:     ceph-devel@vger.kernel.org
 S:     Supported
 W:     http://ceph.com/
@@ -4465,6 +4477,7 @@ F:        net/ceph/
 
 CEPH DISTRIBUTED FILE SYSTEM CLIENT (CEPH)
 M:     Jeff Layton <jlayton@kernel.org>
+M:     Xiubo Li <xiubli@redhat.com>
 M:     Ilya Dryomov <idryomov@gmail.com>
 L:     ceph-devel@vger.kernel.org
 S:     Supported
@@ -4776,7 +4789,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/coda/
+F:     drivers/media/platform/chips-media/
 
 CODE OF CONDUCT
 M:     Greg Kroah-Hartman <gregkh@linuxfoundation.org>
@@ -5490,7 +5503,7 @@ L:        linux-media@vger.kernel.org
 S:     Supported
 W:     https://linuxtv.org
 T:     git git://linuxtv.org/media_tree.git
-F:     drivers/media/platform/sti/delta
+F:     drivers/media/platform/st/sti/delta
 
 DELTA AHE-50DC FAN CONTROL MODULE DRIVER
 M:     Zev Weiss <zev@bewilderbeest.net>
@@ -5602,7 +5615,7 @@ F:        include/linux/devm-helpers.h
 
 DEVICE-MAPPER  (LVM)
 M:     Alasdair Kergon <agk@redhat.com>
-M:     Mike Snitzer <snitzer@redhat.com>
+M:     Mike Snitzer <snitzer@kernel.org>
 M:     dm-devel@redhat.com
 L:     dm-devel@redhat.com
 S:     Maintained
@@ -5750,7 +5763,7 @@ T:        git git://anongit.freedesktop.org/drm/drm-misc
 F:     Documentation/driver-api/dma-buf.rst
 F:     drivers/dma-buf/
 F:     include/linux/*fence.h
-F:     include/linux/dma-buf*
+F:     include/linux/dma-buf.h
 F:     include/linux/dma-resv.h
 K:     \bdma_(?:buf|fence|resv)\b
 
@@ -6093,7 +6106,8 @@ L:        dri-devel@lists.freedesktop.org
 T:     git git://anongit.freedesktop.org/drm/drm-misc
 S:     Maintained
 F:     drivers/gpu/drm/panel/panel-lvds.c
-F:     Documentation/devicetree/bindings/display/panel/lvds.yaml
+F:     Documentation/devicetree/bindings/display/lvds.yaml
+F:     Documentation/devicetree/bindings/display/panel/panel-lvds.yaml
 
 DRM DRIVER FOR MANTIX MLAF057WE51 PANELS
 M:     Guido Günther <agx@sigxcpu.org>
@@ -6122,6 +6136,14 @@ T:       git git://anongit.freedesktop.org/drm/drm-misc
 F:     Documentation/devicetree/bindings/display/multi-inno,mi0283qt.txt
 F:     drivers/gpu/drm/tiny/mi0283qt.c
 
+DRM DRIVER FOR MIPI DBI compatible panels
+M:     Noralf Trønnes <noralf@tronnes.org>
+S:     Maintained
+W:     https://github.com/notro/panel-mipi-dbi/wiki
+T:     git git://anongit.freedesktop.org/drm/drm-misc
+F:     Documentation/devicetree/bindings/display/panel/panel-mipi-dbi-spi.yaml
+F:     drivers/gpu/drm/tiny/panel-mipi-dbi.c
+
 DRM DRIVER FOR MSM ADRENO GPU
 M:     Rob Clark <robdclark@gmail.com>
 M:     Sean Paul <sean@poorly.run>
@@ -6142,6 +6164,13 @@ T:       git git://anongit.freedesktop.org/drm/drm-misc
 F:     Documentation/devicetree/bindings/display/panel/novatek,nt35510.yaml
 F:     drivers/gpu/drm/panel/panel-novatek-nt35510.c
 
+DRM DRIVER FOR NOVATEK NT35560 PANELS
+M:     Linus Walleij <linus.walleij@linaro.org>
+S:     Maintained
+T:     git git://anongit.freedesktop.org/drm/drm-misc
+F:     Documentation/devicetree/bindings/display/panel/sony,acx424akp.yaml
+F:     drivers/gpu/drm/panel/panel-novatek-nt35560.c
+
 DRM DRIVER FOR NOVATEK NT36672A PANELS
 M:     Sumit Semwal <sumit.semwal@linaro.org>
 S:     Maintained
@@ -6178,6 +6207,13 @@ T:       git git://anongit.freedesktop.org/drm/drm-misc
 F:     Documentation/devicetree/bindings/display/repaper.txt
 F:     drivers/gpu/drm/tiny/repaper.c
 
+DRM DRIVER FOR SOLOMON SSD130X OLED DISPLAYS
+M:     Javier Martinez Canillas <javierm@redhat.com>
+S:     Maintained
+T:     git git://anongit.freedesktop.org/drm/drm-misc
+F:     Documentation/devicetree/bindings/display/solomon,ssd1307fb.yaml
+F:     drivers/gpu/drm/solomon/ssd130x*
+
 DRM DRIVER FOR QEMU'S CIRRUS DEVICE
 M:     Dave Airlie <airlied@redhat.com>
 M:     Gerd Hoffmann <kraxel@redhat.com>
@@ -6266,12 +6302,6 @@ T:       git git://anongit.freedesktop.org/drm/drm-misc
 F:     Documentation/devicetree/bindings/display/sitronix,st7735r.yaml
 F:     drivers/gpu/drm/tiny/st7735r.c
 
-DRM DRIVER FOR SONY ACX424AKP PANELS
-M:     Linus Walleij <linus.walleij@linaro.org>
-S:     Maintained
-T:     git git://anongit.freedesktop.org/drm/drm-misc
-F:     drivers/gpu/drm/panel/panel-sony-acx424akp.c
-
 DRM DRIVER FOR ST-ERICSSON MCDE
 M:     Linus Walleij <linus.walleij@linaro.org>
 S:     Maintained
@@ -7803,10 +7833,10 @@ F:      drivers/net/ethernet/freescale/fs_enet/
 F:     include/linux/fs_enet_pd.h
 
 FREESCALE SOC SOUND DRIVERS
-M:     Nicolin Chen <nicoleotsuka@gmail.com>
+M:     Shengjiu Wang <shengjiu.wang@gmail.com>
 M:     Xiubo Li <Xiubo.Lee@gmail.com>
 R:     Fabio Estevam <festevam@gmail.com>
-R:     Shengjiu Wang <shengjiu.wang@gmail.com>
+R:     Nicolin Chen <nicoleotsuka@gmail.com>
 L:     alsa-devel@alsa-project.org (moderated for non-subscribers)
 L:     linuxppc-dev@lists.ozlabs.org
 S:     Maintained
@@ -7947,6 +7977,12 @@ L:       platform-driver-x86@vger.kernel.org
 S:     Maintained
 F:     drivers/platform/x86/fujitsu-tablet.c
 
+FUNGIBLE ETHERNET DRIVERS
+M:     Dimitris Michailidis <dmichail@fungible.com>
+L:     netdev@vger.kernel.org
+S:     Supported
+F:     drivers/net/ethernet/fungible/
+
 FUSE: FILESYSTEM IN USERSPACE
 M:     Miklos Szeredi <miklos@szeredi.hu>
 L:     linux-fsdevel@vger.kernel.org
@@ -8720,9 +8756,9 @@ L:        linux-crypto@vger.kernel.org
 S:     Maintained
 F:     Documentation/ABI/testing/debugfs-hisi-zip
 F:     drivers/crypto/hisilicon/qm.c
-F:     drivers/crypto/hisilicon/qm.h
 F:     drivers/crypto/hisilicon/sgl.c
 F:     drivers/crypto/hisilicon/zip/
+F:     include/linux/hisi_acc_qm.h
 
 HISILICON ROCE DRIVER
 M:     Wenpeng Liang <liangwenpeng@huawei.com>
@@ -8886,7 +8922,7 @@ L:        linux-media@vger.kernel.org
 S:     Supported
 W:     https://linuxtv.org
 T:     git git://linuxtv.org/media_tree.git
-F:     drivers/media/platform/sti/hva
+F:     drivers/media/platform/st/sti/hva
 
 HWPOISON MEMORY FAILURE HANDLING
 M:     Naoya Horiguchi <naoya.horiguchi@nec.com>
@@ -8921,6 +8957,12 @@ L:       linux-media@vger.kernel.org
 S:     Maintained
 F:     drivers/media/i2c/hi846.c
 
+HYNIX HI847 SENSOR DRIVER
+M:     Shawn Tu <shawnx.tu@intel.com>
+L:     linux-media@vger.kernel.org
+S:     Maintained
+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>
@@ -9902,6 +9944,13 @@ S:       Maintained
 F:     arch/x86/include/asm/intel_scu_ipc.h
 F:     drivers/platform/x86/intel_scu_*
 
+INTEL SDSI DRIVER
+M:     David E. Box <david.e.box@linux.intel.com>
+S:     Supported
+F:     drivers/platform/x86/intel/sdsi.c
+F:     tools/arch/x86/intel_sdsi/
+F:     tools/testing/selftests/drivers/sdsi/
+
 INTEL SKYLAKE INT3472 ACPI DEVICE DRIVER
 M:     Daniel Scally <djrscally@gmail.com>
 S:     Maintained
@@ -9938,7 +9987,7 @@ INTEL UNCORE FREQUENCY CONTROL
 M:     Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
 L:     platform-driver-x86@vger.kernel.org
 S:     Maintained
-F:     drivers/platform/x86/intel/uncore-frequency.c
+F:     drivers/platform/x86/intel/uncore-frequency/
 
 INTEL VENDOR SPECIFIC EXTENDED CAPABILITIES DRIVER
 M:     David E. Box <david.e.box@linux.intel.com>
@@ -10035,6 +10084,14 @@ L:     linux-iio@vger.kernel.org
 F:     Documentation/devicetree/bindings/counter/interrupt-counter.yaml
 F:     drivers/counter/interrupt-cnt.c
 
+INTERSIL ISL7998X VIDEO DECODER DRIVER
+M:     Michael Tretter <m.tretter@pengutronix.de>
+R:     Pengutronix Kernel Team <kernel@pengutronix.de>
+L:     linux-media@vger.kernel.org
+S:     Maintained
+F:     Documentation/devicetree/bindings/media/i2c/isil,isl79987.yaml
+F:     drivers/media/i2c/isl7998x.c
+
 INVENSENSE ICM-426xx IMU DRIVER
 M:     Jean-Baptiste Maneyrol <jmaneyrol@invensense.com>
 L:     linux-iio@vger.kernel.org
@@ -10082,6 +10139,13 @@ F:     include/linux/iova.h
 F:     include/linux/of_iommu.h
 F:     include/uapi/linux/iommu.h
 
+IOSYS-MAP HELPERS
+M:     Thomas Zimmermann <tzimmermann@suse.de>
+L:     dri-devel@lists.freedesktop.org
+S:     Maintained
+T:     git git://anongit.freedesktop.org/drm/drm-misc
+F:     include/linux/iosys-map.h
+
 IO_URING
 M:     Jens Axboe <axboe@kernel.dk>
 R:     Pavel Begunkov <asml.silence@gmail.com>
@@ -10334,7 +10398,7 @@ M:      Mikhail Ulyanov <mikhail.ulyanov@cogentembedded.com>
 L:     linux-media@vger.kernel.org
 L:     linux-renesas-soc@vger.kernel.org
 S:     Maintained
-F:     drivers/media/platform/rcar_jpu.c
+F:     drivers/media/platform/renesas/rcar_jpu.c
 
 JSM Neo PCI based serial card
 L:     linux-serial@vger.kernel.org
@@ -10582,8 +10646,8 @@ F:      arch/riscv/kvm/
 KERNEL VIRTUAL MACHINE for s390 (KVM/s390)
 M:     Christian Borntraeger <borntraeger@linux.ibm.com>
 M:     Janosch Frank <frankja@linux.ibm.com>
+M:     Claudio Imbrenda <imbrenda@linux.ibm.com>
 R:     David Hildenbrand <david@redhat.com>
-R:     Claudio Imbrenda <imbrenda@linux.ibm.com>
 L:     kvm@vger.kernel.org
 S:     Supported
 W:     http://www.ibm.com/developerworks/linux/linux390/
@@ -10793,7 +10857,6 @@ L7 BPF FRAMEWORK
 M:     John Fastabend <john.fastabend@gmail.com>
 M:     Daniel Borkmann <daniel@iogearbox.net>
 M:     Jakub Sitnicki <jakub@cloudflare.com>
-M:     Lorenz Bauer <lmb@cloudflare.com>
 L:     netdev@vger.kernel.org
 L:     bpf@vger.kernel.org
 S:     Maintained
@@ -11361,6 +11424,13 @@ S:     Maintained
 W:     http://linux-test-project.github.io/
 T:     git git://github.com/linux-test-project/ltp.git
 
+LYNX 28G SERDES PHY DRIVER
+M:     Ioana Ciornei <ioana.ciornei@nxp.com>
+L:     netdev@vger.kernel.org
+S:     Supported
+F:     Documentation/devicetree/bindings/phy/fsl,lynx-28g.yaml
+F:     drivers/phy/freescale/phy-fsl-lynx-28g.c
+
 LYNX PCS MODULE
 M:     Ioana Ciornei <ioana.ciornei@nxp.com>
 L:     netdev@vger.kernel.org
@@ -11878,7 +11948,7 @@ M:      Philipp Zabel <p.zabel@pengutronix.de>
 L:     linux-media@vger.kernel.org
 S:     Maintained
 T:     git git://linuxtv.org/media_tree.git
-F:     drivers/media/platform/imx-pxp.[ch]
+F:     drivers/media/platform/nxp/imx-pxp.[ch]
 
 MEDIA DRIVERS FOR ASCOT2E
 M:     Sergey Kozlov <serjk@netup.ru>
@@ -11943,10 +12013,10 @@ L:    linux-media@vger.kernel.org
 S:     Maintained
 T:     git git://linuxtv.org/media_tree.git
 F:     Documentation/admin-guide/media/imx7.rst
+F:     Documentation/devicetree/bindings/media/nxp,imx-mipi-csi2.yaml
 F:     Documentation/devicetree/bindings/media/nxp,imx7-csi.yaml
-F:     Documentation/devicetree/bindings/media/nxp,imx7-mipi-csi2.yaml
+F:     drivers/media/platform/imx/imx-mipi-csis.c
 F:     drivers/staging/media/imx/imx7-media-csi.c
-F:     drivers/staging/media/imx/imx7-mipi-csis.c
 
 MEDIA DRIVERS FOR HELENE
 M:     Abylay Ospan <aospan@netup.ru>
@@ -12001,7 +12071,7 @@ L:      linux-tegra@vger.kernel.org
 S:     Maintained
 T:     git git://linuxtv.org/media_tree.git
 F:     Documentation/devicetree/bindings/media/nvidia,tegra-vde.txt
-F:     drivers/staging/media/tegra-vde/
+F:     drivers/media/platform/nvidia/tegra-vde/
 
 MEDIA DRIVERS FOR RENESAS - CEU
 M:     Jacopo Mondi <jacopo@jmondi.org>
@@ -12010,7 +12080,7 @@ L:      linux-renesas-soc@vger.kernel.org
 S:     Supported
 T:     git git://linuxtv.org/media_tree.git
 F:     Documentation/devicetree/bindings/media/renesas,ceu.yaml
-F:     drivers/media/platform/renesas-ceu.c
+F:     drivers/media/platform/renesas/renesas-ceu.c
 F:     include/media/drv-intf/renesas-ceu.h
 
 MEDIA DRIVERS FOR RENESAS - DRIF
@@ -12020,7 +12090,7 @@ L:      linux-renesas-soc@vger.kernel.org
 S:     Supported
 T:     git git://linuxtv.org/media_tree.git
 F:     Documentation/devicetree/bindings/media/renesas,drif.yaml
-F:     drivers/media/platform/rcar_drif.c
+F:     drivers/media/platform/renesas/rcar_drif.c
 
 MEDIA DRIVERS FOR RENESAS - FCP
 M:     Laurent Pinchart <laurent.pinchart@ideasonboard.com>
@@ -12029,7 +12099,7 @@ L:      linux-renesas-soc@vger.kernel.org
 S:     Supported
 T:     git git://linuxtv.org/media_tree.git
 F:     Documentation/devicetree/bindings/media/renesas,fcp.yaml
-F:     drivers/media/platform/rcar-fcp.c
+F:     drivers/media/platform/renesas/rcar-fcp.c
 F:     include/media/rcar-fcp.h
 
 MEDIA DRIVERS FOR RENESAS - FDP1
@@ -12039,7 +12109,7 @@ L:      linux-renesas-soc@vger.kernel.org
 S:     Supported
 T:     git git://linuxtv.org/media_tree.git
 F:     Documentation/devicetree/bindings/media/renesas,fdp1.yaml
-F:     drivers/media/platform/rcar_fdp1.c
+F:     drivers/media/platform/renesas/rcar_fdp1.c
 
 MEDIA DRIVERS FOR RENESAS - VIN
 M:     Niklas Söderlund <niklas.soderlund@ragnatech.se>
@@ -12050,8 +12120,8 @@ T:      git git://linuxtv.org/media_tree.git
 F:     Documentation/devicetree/bindings/media/renesas,csi2.yaml
 F:     Documentation/devicetree/bindings/media/renesas,isp.yaml
 F:     Documentation/devicetree/bindings/media/renesas,vin.yaml
-F:     drivers/media/platform/rcar-isp.c
-F:     drivers/media/platform/rcar-vin/
+F:     drivers/media/platform/renesas/rcar-isp.c
+F:     drivers/media/platform/renesas/rcar-vin/
 
 MEDIA DRIVERS FOR RENESAS - VSP1
 M:     Laurent Pinchart <laurent.pinchart@ideasonboard.com>
@@ -12061,7 +12131,7 @@ L:      linux-renesas-soc@vger.kernel.org
 S:     Supported
 T:     git git://linuxtv.org/media_tree.git
 F:     Documentation/devicetree/bindings/media/renesas,vsp1.yaml
-F:     drivers/media/platform/vsp1/
+F:     drivers/media/platform/renesas/vsp1/
 
 MEDIA DRIVERS FOR ST STV0910 DEMODULATOR ICs
 L:     linux-media@vger.kernel.org
@@ -12083,7 +12153,7 @@ L:      linux-media@vger.kernel.org
 S:     Supported
 T:     git git://linuxtv.org/media_tree.git
 F:     Documentation/devicetree/bindings/media/st,stm32-dcmi.yaml
-F:     drivers/media/platform/stm32/stm32-dcmi.c
+F:     drivers/media/platform/st/stm32/stm32-dcmi.c
 
 MEDIA INPUT INFRASTRUCTURE (V4L/DVB)
 M:     Mauro Carvalho Chehab <mchehab@kernel.org>
@@ -12167,7 +12237,7 @@ M:      Rick Chang <rick.chang@mediatek.com>
 M:     Bin Liu <bin.liu@mediatek.com>
 S:     Supported
 F:     Documentation/devicetree/bindings/media/mediatek-jpeg-decoder.txt
-F:     drivers/media/platform/mtk-jpeg/
+F:     drivers/media/platform/mediatek/jpeg/
 
 MEDIATEK MDP DRIVER
 M:     Minghsiu Tsai <minghsiu.tsai@mediatek.com>
@@ -12175,8 +12245,8 @@ M:      Houlong Wei <houlong.wei@mediatek.com>
 M:     Andrew-CT Chen <andrew-ct.chen@mediatek.com>
 S:     Supported
 F:     Documentation/devicetree/bindings/media/mediatek-mdp.txt
-F:     drivers/media/platform/mtk-mdp/
-F:     drivers/media/platform/mtk-vpu/
+F:     drivers/media/platform/mediatek/mdp/
+F:     drivers/media/platform/mediatek/vpu/
 
 MEDIATEK MEDIA DRIVER
 M:     Tiffany Lin <tiffany.lin@mediatek.com>
@@ -12184,8 +12254,8 @@ M:      Andrew-CT Chen <andrew-ct.chen@mediatek.com>
 S:     Supported
 F:     Documentation/devicetree/bindings/media/mediatek-vcodec.txt
 F:     Documentation/devicetree/bindings/media/mediatek-vpu.txt
-F:     drivers/media/platform/mtk-vcodec/
-F:     drivers/media/platform/mtk-vpu/
+F:     drivers/media/platform/mediatek/vcodec/
+F:     drivers/media/platform/mediatek/vpu/
 
 MEDIATEK MMC/SD/SDIO DRIVER
 M:     Chaotian Jing <chaotian.jing@mediatek.com>
@@ -12201,6 +12271,7 @@ R:      Shayne Chen <shayne.chen@mediatek.com>
 R:     Sean Wang <sean.wang@mediatek.com>
 L:     linux-wireless@vger.kernel.org
 S:     Maintained
+F:     Documentation/devicetree/bindings/net/wireless/mediatek,mt76.yaml
 F:     drivers/net/wireless/mediatek/mt76/
 
 MEDIATEK MT7601U WIRELESS LAN DRIVER
@@ -12560,7 +12631,7 @@ L:      linux-amlogic@lists.infradead.org
 S:     Supported
 T:     git git://linuxtv.org/media_tree.git
 F:     Documentation/devicetree/bindings/media/amlogic,axg-ge2d.yaml
-F:     drivers/media/platform/meson/ge2d/
+F:     drivers/media/platform/amlogic/meson-ge2d/
 
 MESON NAND CONTROLLER DRIVER FOR AMLOGIC SOCS
 M:     Liang Yang <liang.yang@amlogic.com>
@@ -12642,6 +12713,13 @@ L:     alsa-devel@alsa-project.org (moderated for non-subscribers)
 S:     Supported
 F:     sound/soc/atmel
 
+MICROCHIP CSI2DC DRIVER
+M:     Eugen Hristev <eugen.hristev@microchip.com>
+L:     linux-media@vger.kernel.org
+S:     Supported
+F:     Documentation/devicetree/bindings/media/microchip,csi2dc.yaml
+F:     drivers/media/platform/atmel/microchip-csi2dc.c
+
 MICROCHIP ECC DRIVER
 M:     Tudor Ambarus <tudor.ambarus@microchip.com>
 L:     linux-crypto@vger.kernel.org
@@ -12667,11 +12745,8 @@ L:     linux-media@vger.kernel.org
 S:     Supported
 F:     Documentation/devicetree/bindings/media/atmel,isc.yaml
 F:     Documentation/devicetree/bindings/media/microchip,xisc.yaml
-F:     drivers/media/platform/atmel/atmel-isc-base.c
-F:     drivers/media/platform/atmel/atmel-isc-regs.h
-F:     drivers/media/platform/atmel/atmel-isc.h
-F:     drivers/media/platform/atmel/atmel-sama5d2-isc.c
-F:     drivers/media/platform/atmel/atmel-sama7g5-isc.c
+F:     drivers/media/platform/atmel/atmel-isc*
+F:     drivers/media/platform/atmel/atmel-sama*-isc*
 F:     include/linux/atmel-isc-media.h
 
 MICROCHIP ISI DRIVER
@@ -14130,7 +14205,7 @@ M:      Laurent Pinchart <laurent.pinchart@ideasonboard.com>
 L:     linux-media@vger.kernel.org
 S:     Maintained
 F:     Documentation/devicetree/bindings/media/ti,omap3isp.txt
-F:     drivers/media/platform/omap3isp/
+F:     drivers/media/platform/ti/omap3isp/
 F:     drivers/staging/media/omap4iss/
 
 OMAP MMC SUPPORT
@@ -14238,6 +14313,12 @@ M:     Harald Welte <laforge@gnumonks.org>
 S:     Maintained
 F:     drivers/char/pcmcia/cm4040_cs.*
 
+OMNIVISION OG01A1B SENSOR DRIVER
+M:     Shawn Tu <shawnx.tu@intel.com>
+L:     linux-media@vger.kernel.org
+S:     Maintained
+F:     drivers/media/i2c/og01a1b.c
+
 OMNIVISION OV02A10 SENSOR DRIVER
 M:     Dongchun Zhu <dongchun.zhu@mediatek.com>
 L:     linux-media@vger.kernel.org
@@ -14246,6 +14327,13 @@ T:     git git://linuxtv.org/media_tree.git
 F:     Documentation/devicetree/bindings/media/i2c/ovti,ov02a10.yaml
 F:     drivers/media/i2c/ov02a10.c
 
+OMNIVISION OV08D10 SENSOR DRIVER
+M:     Jimmy Su <jimmy.su@intel.com>
+L:     linux-media@vger.kernel.org
+S:     Maintained
+T:     git git://linuxtv.org/media_tree.git
+F:     drivers/media/i2c/ov08d10.c
+
 OMNIVISION OV13858 SENSOR DRIVER
 M:     Sakari Ailus <sakari.ailus@linux.intel.com>
 L:     linux-media@vger.kernel.org
@@ -14850,6 +14938,7 @@ F:      drivers/pci/controller/mobiveil/pcie-mobiveil*
 
 PCI DRIVER FOR MVEBU (Marvell Armada 370 and Armada XP SOC support)
 M:     Thomas Petazzoni <thomas.petazzoni@bootlin.com>
+M:     Pali Rohár <pali@kernel.org>
 L:     linux-pci@vger.kernel.org
 L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:     Maintained
@@ -15353,7 +15442,7 @@ S:      Maintained
 C:     irc://irc.libera.chat/linux-exynos
 Q:     https://patchwork.kernel.org/project/linux-samsung-soc/list/
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/samsung.git
-F:     Documentation/devicetree/bindings/pinctrl/samsung-pinctrl.txt
+F:     Documentation/devicetree/bindings/pinctrl/samsung,pinctrl*yaml
 F:     drivers/pinctrl/samsung/
 F:     include/dt-bindings/pinctrl/samsung.h
 
@@ -15963,8 +16052,8 @@ M:      Kalle Valo <kvalo@kernel.org>
 L:     ath11k@lists.infradead.org
 S:     Supported
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git
+F:     Documentation/devicetree/bindings/net/wireless/qcom,ath11k.yaml
 F:     drivers/net/wireless/ath/ath11k/
-F:     Documentation/devicetree/bindings/net/wireless/qcom,ath11k.txt
 
 QUALCOMM ATHEROS ATH9K WIRELESS DRIVER
 M:     Toke Høiland-Jørgensen <toke@toke.dk>
@@ -16413,9 +16502,8 @@ REALTEK RTL83xx SMI DSA ROUTER CHIPS
 M:     Linus Walleij <linus.walleij@linaro.org>
 M:     Alvin Šipraga <alsi@bang-olufsen.dk>
 S:     Maintained
-F:     Documentation/devicetree/bindings/net/dsa/realtek-smi.txt
-F:     drivers/net/dsa/realtek-smi*
-F:     drivers/net/dsa/rtl83*
+F:     Documentation/devicetree/bindings/net/dsa/realtek.yaml
+F:     drivers/net/dsa/realtek/*
 
 REALTEK WIRELESS DRIVER (rtlwifi family)
 M:     Ping-Ke Shih <pkshih@realtek.com>
@@ -16637,6 +16725,15 @@ S:     Maintained
 F:     drivers/mtd/nand/raw/r852.c
 F:     drivers/mtd/nand/raw/r852.h
 
+RISC-V PMU DRIVERS
+M:     Atish Patra <atishp@atishpatra.org>
+R:     Anup Patel <anup@brainfault.org>
+L:     linux-riscv@lists.infradead.org
+S:     Supported
+F:     drivers/perf/riscv_pmu.c
+F:     drivers/perf/riscv_pmu_legacy.c
+F:     drivers/perf/riscv_pmu_sbi.c
+
 RISC-V ARCHITECTURE
 M:     Paul Walmsley <paul.walmsley@sifive.com>
 M:     Palmer Dabbelt <palmer@dabbelt.com>
@@ -16651,8 +16748,10 @@ K:     riscv
 
 RISC-V/MICROCHIP POLARFIRE SOC SUPPORT
 M:     Lewis Hanly <lewis.hanly@microchip.com>
+M:     Conor Dooley <conor.dooley@microchip.com>
 L:     linux-riscv@lists.infradead.org
 S:     Supported
+F:     arch/riscv/boot/dts/microchip/
 F:     drivers/mailbox/mailbox-mpfs.c
 F:     drivers/soc/microchip/
 F:     include/soc/microchip/mpfs.h
@@ -16680,8 +16779,7 @@ F:      Documentation/devicetree/bindings/sound/rockchip,i2s-tdm.yaml
 F:     sound/soc/rockchip/rockchip_i2s_tdm.*
 
 ROCKCHIP ISP V1 DRIVER
-M:     Helen Koike <helen.koike@collabora.com>
-M:     Dafna Hirschfeld <dafna.hirschfeld@collabora.com>
+M:     Dafna Hirschfeld <dafna@fastmail.com>
 L:     linux-media@vger.kernel.org
 L:     linux-rockchip@lists.infradead.org
 S:     Maintained
@@ -16950,9 +17048,7 @@ L:      linux-s390@vger.kernel.org
 S:     Supported
 W:     http://www.ibm.com/developerworks/linux/linux390/
 F:     Documentation/s390/vfio-ap.rst
-F:     drivers/s390/crypto/vfio_ap_drv.c
-F:     drivers/s390/crypto/vfio_ap_ops.c
-F:     drivers/s390/crypto/vfio_ap_private.h
+F:     drivers/s390/crypto/vfio_ap*
 
 S390 VFIO-CCW DRIVER
 M:     Eric Farman <farman@linux.ibm.com>
@@ -17100,7 +17196,7 @@ M:      Sylwester Nawrocki <sylvester.nawrocki@gmail.com>
 L:     linux-media@vger.kernel.org
 L:     linux-samsung-soc@vger.kernel.org
 S:     Maintained
-F:     drivers/media/platform/s3c-camif/
+F:     drivers/media/platform/samsung/s3c-camif/
 F:     include/media/drv-intf/s3c_camif.h
 
 SAMSUNG S3FWRN5 NFC DRIVER
@@ -17140,7 +17236,7 @@ M:      Sylwester Nawrocki <s.nawrocki@samsung.com>
 L:     linux-media@vger.kernel.org
 S:     Supported
 Q:     https://patchwork.linuxtv.org/project/linux-media/list/
-F:     drivers/media/platform/exynos4-is/
+F:     drivers/media/platform/samsung/exynos4-is/
 
 SAMSUNG SOC CLOCK DRIVERS
 M:     Sylwester Nawrocki <s.nawrocki@samsung.com>
@@ -17575,7 +17671,7 @@ F:      include/media/i2c/rj54n1cb0c.h
 SH_VOU V4L2 OUTPUT DRIVER
 L:     linux-media@vger.kernel.org
 S:     Orphan
-F:     drivers/media/platform/sh_vou.c
+F:     drivers/media/platform/renesas/sh_vou.c
 F:     include/media/drv-intf/sh_vou.h
 
 SI2157 MEDIA DRIVER
@@ -18347,7 +18443,8 @@ F:      Documentation/devicetree/bindings/iio/imu/st,lsm6dsx.yaml
 F:     drivers/iio/imu/st_lsm6dsx/
 
 ST MIPID02 CSI-2 TO PARALLEL BRIDGE DRIVER
-M:     Mickael Guene <mickael.guene@st.com>
+M:     Benjamin Mugnier <benjamin.mugnier@foss.st.com>
+M:     Sylvain Petinot <sylvain.petinot@foss.st.com>
 L:     linux-media@vger.kernel.org
 S:     Maintained
 T:     git git://linuxtv.org/media_tree.git
@@ -19144,6 +19241,7 @@ TEXAS INSTRUMENTS ASoC DRIVERS
 M:     Peter Ujfalusi <peter.ujfalusi@gmail.com>
 L:     alsa-devel@alsa-project.org (moderated for non-subscribers)
 S:     Maintained
+F:     Documentation/devicetree/bindings/sound/davinci-mcasp-audio.yaml
 F:     sound/soc/ti/
 
 TEXAS INSTRUMENTS' DAC7612 DAC DRIVER
@@ -19324,7 +19422,7 @@ S:      Maintained
 W:     https://linuxtv.org
 Q:     http://patchwork.linuxtv.org/project/linux-media/list/
 T:     git git://linuxtv.org/mhadli/v4l-dvb-davinci_devices.git
-F:     drivers/media/platform/am437x/
+F:     drivers/media/platform/ti/am437x/
 
 TI BANDGAP AND THERMAL DRIVER
 M:     Eduardo Valentin <edubezval@gmail.com>
@@ -19383,7 +19481,7 @@ S:      Maintained
 W:     https://linuxtv.org
 Q:     http://patchwork.linuxtv.org/project/linux-media/list/
 T:     git git://linuxtv.org/mhadli/v4l-dvb-davinci_devices.git
-F:     drivers/media/platform/davinci/
+F:     drivers/media/platform/ti/davinci/
 F:     include/media/davinci/
 
 TI ENHANCED QUADRATURE ENCODER PULSE (eQEP) DRIVER
@@ -19469,7 +19567,8 @@ W:      http://linuxtv.org/
 Q:     http://patchwork.linuxtv.org/project/linux-media/list/
 F:     Documentation/devicetree/bindings/media/ti,cal.yaml
 F:     Documentation/devicetree/bindings/media/ti,vpe.yaml
-F:     drivers/media/platform/ti-vpe/
+F:     drivers/media/platform/ti/cal/
+F:     drivers/media/platform/ti/vpe/
 
 TI WILINK WIRELESS DRIVERS
 L:     linux-wireless@vger.kernel.org
@@ -20364,6 +20463,13 @@ L:     kvm@vger.kernel.org
 S:     Maintained
 F:     drivers/vfio/fsl-mc/
 
+VFIO HISILICON PCI DRIVER
+M:     Longfang Liu <liulongfang@huawei.com>
+M:     Shameer Kolothum <shameerali.kolothum.thodi@huawei.com>
+L:     kvm@vger.kernel.org
+S:     Maintained
+F:     drivers/vfio/pci/hisilicon/
+
 VFIO MEDIATED DEVICE DRIVERS
 M:     Kirti Wankhede <kwankhede@nvidia.com>
 L:     kvm@vger.kernel.org
@@ -20373,12 +20479,28 @@ F:    drivers/vfio/mdev/
 F:     include/linux/mdev.h
 F:     samples/vfio-mdev/
 
+VFIO PCI DEVICE SPECIFIC DRIVERS
+R:     Jason Gunthorpe <jgg@nvidia.com>
+R:     Yishai Hadas <yishaih@nvidia.com>
+R:     Shameer Kolothum <shameerali.kolothum.thodi@huawei.com>
+R:     Kevin Tian <kevin.tian@intel.com>
+L:     kvm@vger.kernel.org
+S:     Maintained
+P:     Documentation/driver-api/vfio-pci-device-specific-driver-acceptance.rst
+F:     drivers/vfio/pci/*/
+
 VFIO PLATFORM DRIVER
 M:     Eric Auger <eric.auger@redhat.com>
 L:     kvm@vger.kernel.org
 S:     Maintained
 F:     drivers/vfio/platform/
 
+VFIO MLX5 PCI DRIVER
+M:     Yishai Hadas <yishaih@nvidia.com>
+L:     kvm@vger.kernel.org
+S:     Maintained
+F:     drivers/vfio/pci/mlx5/
+
 VGA_SWITCHEROO
 R:     Lukas Wunner <lukas@wunner.de>
 S:     Maintained
@@ -20442,8 +20564,8 @@ F:      drivers/media/common/videobuf2/*
 F:     include/media/videobuf2-*
 
 VIMC VIRTUAL MEDIA CONTROLLER DRIVER
-M:     Helen Koike <helen.koike@collabora.com>
-R:     Shuah Khan <skhan@linuxfoundation.org>
+M:     Shuah Khan <skhan@linuxfoundation.org>
+R:     Kieran Bingham <kieran.bingham@ideasonboard.com>
 L:     linux-media@vger.kernel.org
 S:     Maintained
 W:     https://linuxtv.org
@@ -21132,7 +21254,7 @@ L:      linux-media@vger.kernel.org
 S:     Maintained
 W:     https://linuxtv.org
 T:     git git://linuxtv.org/media_tree.git
-F:     drivers/media/tuners/tuner-xc2028.*
+F:     drivers/media/tuners/xc2028.*
 
 XDP (eXpress Data Path)
 M:     Alexei Starovoitov <ast@kernel.org>