projects / platform / kernel / linux-starfive.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Merge tag 'devicetree-for-5.16' of git://git.kernel.org/pub/scm/linux/kernel/git...
[platform/kernel/linux-starfive.git] / MAINTAINERS
diff --git a/MAINTAINERS b/MAINTAINERS
index 2aa2c95..a941b85 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -334,7 +334,7 @@ F:  drivers/platform/x86/acer-wmi.c
 
 ACPI
 M:     "Rafael J. Wysocki" <rafael@kernel.org>
-M:     Len Brown <lenb@kernel.org>
+R:     Len Brown <lenb@kernel.org>
 L:     linux-acpi@vger.kernel.org
 S:     Supported
 W:     https://01.org/linux-acpi
@@ -355,7 +355,7 @@ F:  tools/power/acpi/
 
 ACPI APEI
 M:     "Rafael J. Wysocki" <rafael@kernel.org>
-M:     Len Brown <lenb@kernel.org>
+R:     Len Brown <lenb@kernel.org>
 R:     James Morse <james.morse@arm.com>
 R:     Tony Luck <tony.luck@intel.com>
 R:     Borislav Petkov <bp@alien8.de>
@@ -378,14 +378,6 @@ F: drivers/acpi/acpica/
 F:     include/acpi/
 F:     tools/power/acpi/
 
-ACPI FAN DRIVER
-M:     Zhang Rui <rui.zhang@intel.com>
-L:     linux-acpi@vger.kernel.org
-S:     Supported
-W:     https://01.org/linux-acpi
-B:     https://bugzilla.kernel.org
-F:     drivers/acpi/fan.c
-
 ACPI FOR ARM64 (ACPI/arm64)
 M:     Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
 M:     Hanjun Guo <guohanjun@huawei.com>
@@ -401,6 +393,12 @@ L: platform-driver-x86@vger.kernel.org
 S:     Maintained
 F:     drivers/platform/x86/i2c-multi-instantiate.c
 
+ACPI PCC(Platform Communication Channel) MAILBOX DRIVER
+M:     Sudeep Holla <sudeep.holla@arm.com>
+L:     linux-acpi@vger.kernel.org
+S:     Supported
+F:     drivers/mailbox/pcc.c
+
 ACPI PMIC DRIVERS
 M:     "Rafael J. Wysocki" <rafael@kernel.org>
 M:     Len Brown <lenb@kernel.org>
@@ -414,21 +412,14 @@ T:        git git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
 F:     drivers/acpi/pmic/
 
 ACPI THERMAL DRIVER
-M:     Zhang Rui <rui.zhang@intel.com>
+M:     Rafael J. Wysocki <rafael@kernel.org>
+R:     Zhang Rui <rui.zhang@intel.com>
 L:     linux-acpi@vger.kernel.org
 S:     Supported
 W:     https://01.org/linux-acpi
 B:     https://bugzilla.kernel.org
 F:     drivers/acpi/*thermal*
 
-ACPI VIDEO DRIVER
-M:     Zhang Rui <rui.zhang@intel.com>
-L:     linux-acpi@vger.kernel.org
-S:     Supported
-W:     https://01.org/linux-acpi
-B:     https://bugzilla.kernel.org
-F:     drivers/acpi/acpi_video.c
-
 ACPI VIOT DRIVER
 M:     Jean-Philippe Brucker <jean-philippe@linaro.org>
 L:     linux-acpi@vger.kernel.org
@@ -797,7 +788,7 @@ F:  Documentation/devicetree/bindings/i2c/i2c-altera.txt
 F:     drivers/i2c/busses/i2c-altera.c
 
 ALTERA MAILBOX DRIVER
-M:     Joyce Ooi <joyce.ooi@intel.com>
+M:     Mun Yew Tham <mun.yew.tham@intel.com>
 S:     Maintained
 F:     drivers/mailbox/mailbox-altera.c
 
@@ -810,7 +801,7 @@ F:  Documentation/devicetree/bindings/dma/altr,msgdma.yaml
 F:     drivers/dma/altera-msgdma.c
 
 ALTERA PIO DRIVER
-M:     Joyce Ooi <joyce.ooi@intel.com>
+M:     Mun Yew Tham <mun.yew.tham@intel.com>
 L:     linux-gpio@vger.kernel.org
 S:     Maintained
 F:     drivers/gpio/gpio-altera.c
@@ -902,6 +893,7 @@ F:  include/uapi/linux/psp-sev.h
 AMD DISPLAY CORE
 M:     Harry Wentland <harry.wentland@amd.com>
 M:     Leo Li <sunpeng.li@amd.com>
+M:     Rodrigo Siqueira <Rodrigo.Siqueira@amd.com>
 L:     amd-gfx@lists.freedesktop.org
 S:     Supported
 T:     git https://gitlab.freedesktop.org/agd5f/linux.git
@@ -977,12 +969,12 @@ L:        platform-driver-x86@vger.kernel.org
 S:     Maintained
 F:     drivers/platform/x86/amd-pmc.*
 
-AMD POWERPLAY
+AMD POWERPLAY AND SWSMU
 M:     Evan Quan <evan.quan@amd.com>
 L:     amd-gfx@lists.freedesktop.org
 S:     Supported
 T:     git https://gitlab.freedesktop.org/agd5f/linux.git
-F:     drivers/gpu/drm/amd/pm/powerplay/
+F:     drivers/gpu/drm/amd/pm/
 
 AMD PTDMA DRIVER
 M:     Sanjay R Mehta <sanju.mehta@amd.com>
@@ -1019,6 +1011,14 @@ S:       Maintained
 F:     Documentation/devicetree/bindings/iio/light/ams,as73211.yaml
 F:     drivers/iio/light/as73211.c
 
+AMT (Automatic Multicast Tunneling)
+M:     Taehee Yoo <ap420073@gmail.com>
+L:     netdev@vger.kernel.org
+S:     Maintained
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git
+F:     drivers/net/amt.c
+
 ANALOG DEVICES INC AD7192 DRIVER
 M:     Alexandru Tachici <alexandru.tachici@analog.com>
 L:     linux-iio@vger.kernel.org
@@ -1275,6 +1275,7 @@ F:        drivers/input/mouse/bcm5974.c
 
 APPLE DART IOMMU DRIVER
 M:     Sven Peter <sven@svenpeter.dev>
+R:     Alyssa Rosenzweig <alyssa@rosenzweig.io>
 L:     iommu@lists.linux-foundation.org
 S:     Maintained
 F:     Documentation/devicetree/bindings/iommu/apple,dart.yaml
@@ -1711,6 +1712,8 @@ F:        drivers/*/*alpine*
 
 ARM/APPLE MACHINE SUPPORT
 M:     Hector Martin <marcan@marcan.st>
+M:     Sven Peter <sven@svenpeter.dev>
+R:     Alyssa Rosenzweig <alyssa@rosenzweig.io>
 L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:     Maintained
 W:     https://asahilinux.org
@@ -1719,12 +1722,15 @@ C:      irc://irc.oftc.net/asahi-dev
 T:     git https://github.com/AsahiLinux/linux.git
 F:     Documentation/devicetree/bindings/arm/apple.yaml
 F:     Documentation/devicetree/bindings/interrupt-controller/apple,aic.yaml
+F:     Documentation/devicetree/bindings/mailbox/apple,mailbox.yaml
 F:     Documentation/devicetree/bindings/pci/apple,pcie.yaml
 F:     Documentation/devicetree/bindings/pinctrl/apple,pinctrl.yaml
 F:     arch/arm64/boot/dts/apple/
 F:     drivers/irqchip/irq-apple-aic.c
+F:     drivers/mailbox/apple-mailbox.c
 F:     include/dt-bindings/interrupt-controller/apple-aic.h
 F:     include/dt-bindings/pinctrl/apple.h
+F:     include/linux/apple-mailbox.h
 
 ARM/ARTPEC MACHINE SUPPORT
 M:     Jesper Nilsson <jesper.nilsson@axis.com>
@@ -2237,6 +2243,7 @@ F:        arch/arm/mach-pxa/mioa701.c
 
 ARM/MStar/Sigmastar Armv7 SoC support
 M:     Daniel Palmer <daniel@thingy.jp>
+M:     Romain Perier <romain.perier@gmail.com>
 L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:     Maintained
 W:     http://linux-chenxing.org/
@@ -2713,6 +2720,7 @@ F:        drivers/power/reset/keystone-reset.c
 
 ARM/TEXAS INSTRUMENTS K3 ARCHITECTURE
 M:     Nishanth Menon <nm@ti.com>
+M:     Vignesh Raghavendra <vigneshr@ti.com>
 M:     Tero Kristo <kristo@kernel.org>
 L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:     Supported
@@ -2805,9 +2813,8 @@ F:        arch/arm/mach-pxa/include/mach/vpac270.h
 F:     arch/arm/mach-pxa/vpac270.c
 
 ARM/VT8500 ARM ARCHITECTURE
-M:     Tony Prisk <linux@prisktech.co.nz>
 L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
-S:     Maintained
+S:     Orphan
 F:     Documentation/devicetree/bindings/i2c/i2c-wmt.txt
 F:     arch/arm/mach-vt8500/
 F:     drivers/clocksource/timer-vt8500.c
@@ -2895,6 +2902,12 @@ S:       Maintained
 F:     Documentation/hwmon/asc7621.rst
 F:     drivers/hwmon/asc7621.c
 
+ASIX AX88796C SPI ETHERNET ADAPTER
+M:     Łukasz Stelmach <l.stelmach@samsung.com>
+S:     Maintained
+F:     Documentation/devicetree/bindings/net/asix,ax88796c.yaml
+F:     drivers/net/ethernet/asix/ax88796c_*
+
 ASPEED PINCTRL DRIVERS
 M:     Andrew Jeffery <andrew@aj.id.au>
 L:     linux-aspeed@lists.ozlabs.org (moderated for non-subscribers)
@@ -2963,7 +2976,7 @@ F:        crypto/async_tx/
 F:     include/linux/async_tx.h
 
 AT24 EEPROM DRIVER
-M:     Bartosz Golaszewski <bgolaszewski@baylibre.com>
+M:     Bartosz Golaszewski <brgl@bgdev.pl>
 L:     linux-i2c@vger.kernel.org
 S:     Maintained
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git
@@ -3114,6 +3127,7 @@ W:        https://github.com/linux-audit
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/audit.git
 F:     include/asm-generic/audit_*.h
 F:     include/linux/audit.h
+F:     include/linux/audit_arch.h
 F:     include/uapi/linux/audit.h
 F:     kernel/audit*
 F:     lib/*audit.c
@@ -3216,6 +3230,12 @@ F:       drivers/video/backlight/
 F:     include/linux/backlight.h
 F:     include/linux/pwm_backlight.h
 
+BARCO P50 GPIO DRIVER
+M:     Santosh Kumar Yadav <santoshkumar.yadav@barco.com>
+M:     Peter Korsgaard <peter.korsgaard@barco.com>
+S:     Maintained
+F:     drivers/platform/x86/barco-p50-gpio.c
+
 BATMAN ADVANCED
 M:     Marek Lindner <mareklindner@neomailbox.ch>
 M:     Simon Wunderlich <sw@simonwunderlich.de>
@@ -3386,9 +3406,11 @@ F:       Documentation/networking/filter.rst
 F:     Documentation/userspace-api/ebpf/
 F:     arch/*/net/*
 F:     include/linux/bpf*
+F:     include/linux/btf*
 F:     include/linux/filter.h
 F:     include/trace/events/xdp.h
 F:     include/uapi/linux/bpf*
+F:     include/uapi/linux/btf*
 F:     include/uapi/linux/filter.h
 F:     kernel/bpf/
 F:     kernel/trace/bpf_trace.c
@@ -3422,6 +3444,7 @@ S:        Supported
 F:     arch/arm64/net/
 
 BPF JIT for MIPS (32-BIT AND 64-BIT)
+M:     Johan Almbladh <johan.almbladh@anyfinetworks.com>
 M:     Paul Burton <paulburton@kernel.org>
 L:     netdev@vger.kernel.org
 L:     bpf@vger.kernel.org
@@ -3822,7 +3845,6 @@ F:        drivers/scsi/mpi3mr/
 
 BROADCOM NETXTREME-E ROCE DRIVER
 M:     Selvin Xavier <selvin.xavier@broadcom.com>
-M:     Naresh Kumar PBS <nareshkumar.pbs@broadcom.com>
 L:     linux-rdma@vger.kernel.org
 S:     Supported
 W:     http://www.broadcom.com
@@ -4431,7 +4453,7 @@ N:        cros_ec
 N:     cros-ec
 
 CHRONTEL CH7322 CEC DRIVER
-M:     Jeff Chase <jnchase@google.com>
+M:     Joe Tessler <jrt@google.com>
 L:     linux-media@vger.kernel.org
 S:     Maintained
 T:     git git://linuxtv.org/media_tree.git
@@ -4657,7 +4679,7 @@ W:        http://linux-cifs.samba.org/
 T:     git git://git.samba.org/sfrench/cifs-2.6.git
 F:     Documentation/admin-guide/cifs/
 F:     fs/cifs/
-F:     fs/cifs_common/
+F:     fs/smbfs_common/
 
 COMPACTPCI HOTPLUG CORE
 M:     Scott Murray <scott@spiteful.org>
@@ -5453,6 +5475,19 @@ F:       include/net/devlink.h
 F:     include/uapi/linux/devlink.h
 F:     net/core/devlink.c
 
+DH ELECTRONICS IMX6 DHCOM BOARD SUPPORT
+M:     Christoph Niedermaier <cniedermaier@dh-electronics.com>
+L:     kernel@dh-electronics.com
+S:     Maintained
+F:     arch/arm/boot/dts/imx6*-dhcom-*
+
+DH ELECTRONICS STM32MP1 DHCOM/DHCOR BOARD SUPPORT
+M:     Marek Vasut <marex@denx.de>
+L:     kernel@dh-electronics.com
+S:     Maintained
+F:     arch/arm/boot/dts/stm32mp1*-dhcom-*
+F:     arch/arm/boot/dts/stm32mp1*-dhcor-*
+
 DIALOG SEMICONDUCTOR DRIVERS
 M:     Support Opensource <support.opensource@diasemi.com>
 S:     Supported
@@ -6019,6 +6054,12 @@ T:       git git://anongit.freedesktop.org/drm/drm-misc
 F:     Documentation/devicetree/bindings/display/panel/samsung,lms397kf04.yaml
 F:     drivers/gpu/drm/panel/panel-samsung-db7430.c
 
+DRM DRIVER FOR SAMSUNG S6D27A1 PANELS
+M:     Markuss Broks <markuss.broks@gmail.com>
+S:     Maintained
+F:     Documentation/devicetree/bindings/display/panel/samsung,s6d27a1.yaml
+F:     drivers/gpu/drm/panel/panel-samsung-s6d27a1.c
+
 DRM DRIVER FOR SITRONIX ST7703 PANELS
 M:     Guido Günther <agx@sigxcpu.org>
 R:     Purism Kernel Team <kernel@puri.sm>
@@ -6142,8 +6183,7 @@ T:        git git://anongit.freedesktop.org/drm/drm
 F:     Documentation/devicetree/bindings/display/
 F:     Documentation/devicetree/bindings/gpu/
 F:     Documentation/gpu/
-F:     drivers/gpu/drm/
-F:     drivers/gpu/vga/
+F:     drivers/gpu/
 F:     include/drm/
 F:     include/linux/vga*
 F:     include/uapi/drm/
@@ -6426,6 +6466,14 @@ T:       git git://anongit.freedesktop.org/drm/drm-misc
 F:     drivers/gpu/drm/ttm/
 F:     include/drm/ttm/
 
+DRM GPU SCHEDULER
+M:     Andrey Grodzovsky <andrey.grodzovsky@amd.com>
+L:     dri-devel@lists.freedesktop.org
+S:     Maintained
+T:     git git://anongit.freedesktop.org/drm/drm-misc
+F:     drivers/gpu/drm/scheduler/
+F:     include/drm/gpu_scheduler.h
+
 DSBR100 USB FM RADIO DRIVER
 M:     Alexey Klimov <klimov.linux@gmail.com>
 L:     linux-media@vger.kernel.org
@@ -6684,7 +6732,7 @@ S:        Supported
 F:     drivers/edac/dmc520_edac.c
 
 EDAC-E752X
-M:     Mark Gross <mark.gross@intel.com>
+M:     Mark Gross <markgross@kernel.org>
 L:     linux-edac@vger.kernel.org
 S:     Maintained
 F:     drivers/edac/e752x_edac.c
@@ -7007,7 +7055,6 @@ F:        drivers/net/mdio/fwnode_mdio.c
 F:     drivers/net/mdio/of_mdio.c
 F:     drivers/net/pcs/
 F:     drivers/net/phy/
-F:     drivers/of/of_net.c
 F:     include/dt-bindings/net/qca-ar803x.h
 F:     include/linux/*mdio*.h
 F:     include/linux/mdio/*.h
@@ -7019,6 +7066,7 @@ F:        include/linux/platform_data/mdio-gpio.h
 F:     include/trace/events/mdio.h
 F:     include/uapi/linux/mdio.h
 F:     include/uapi/linux/mii.h
+F:     net/core/of_net.c
 
 EXFAT FILE SYSTEM
 M:     Namjae Jeon <linkinjeon@kernel.org>
@@ -7324,6 +7372,15 @@ L:       netdev@vger.kernel.org
 S:     Maintained
 F:     drivers/net/ethernet/nvidia/*
 
+FORTIFY_SOURCE
+M:     Kees Cook <keescook@chromium.org>
+L:     linux-hardening@vger.kernel.org
+S:     Supported
+F:     include/linux/fortify-string.h
+F:     lib/test_fortify/*
+F:     scripts/test_fortify.sh
+K:     \b__NO_FORTIFY\b
+
 FPGA DFL DRIVERS
 M:     Wu Hao <hao.wu@intel.com>
 R:     Tom Rix <trix@redhat.com>
@@ -7338,10 +7395,11 @@ F:      include/uapi/linux/fpga-dfl.h
 
 FPGA MANAGER FRAMEWORK
 M:     Moritz Fischer <mdf@kernel.org>
+M:     Wu Hao <hao.wu@intel.com>
+M:     Xu Yilun <yilun.xu@intel.com>
 R:     Tom Rix <trix@redhat.com>
 L:     linux-fpga@vger.kernel.org
 S:     Maintained
-W:     http://www.rocketboards.org
 Q:     http://patchwork.kernel.org/project/linux-fpga/list/
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/mdf/linux-fpga.git
 F:     Documentation/devicetree/bindings/fpga/
@@ -7435,7 +7493,7 @@ FREESCALE IMX / MXC FEC DRIVER
 M:     Joakim Zhang <qiangqing.zhang@nxp.com>
 L:     netdev@vger.kernel.org
 S:     Maintained
-F:     Documentation/devicetree/bindings/net/fsl-fec.txt
+F:     Documentation/devicetree/bindings/net/fsl,fec.yaml
 F:     drivers/net/ethernet/freescale/fec.h
 F:     drivers/net/ethernet/freescale/fec_main.c
 F:     drivers/net/ethernet/freescale/fec_ptp.c
@@ -7719,6 +7777,7 @@ M:        Ingo Molnar <mingo@redhat.com>
 R:     Peter Zijlstra <peterz@infradead.org>
 R:     Darren Hart <dvhart@infradead.org>
 R:     Davidlohr Bueso <dave@stgolabs.net>
+R:     André Almeida <andrealmeid@collabora.com>
 L:     linux-kernel@vger.kernel.org
 S:     Maintained
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git locking/core
@@ -7726,7 +7785,7 @@ F:        Documentation/locking/*futex*
 F:     include/asm-generic/futex.h
 F:     include/linux/futex.h
 F:     include/uapi/linux/futex.h
-F:     kernel/futex.c
+F:     kernel/futex/*
 F:     tools/perf/bench/futex*
 F:     tools/testing/selftests/futex/
 
@@ -7987,7 +8046,7 @@ F:        include/linux/gpio/regmap.h
 
 GPIO SUBSYSTEM
 M:     Linus Walleij <linus.walleij@linaro.org>
-M:     Bartosz Golaszewski <bgolaszewski@baylibre.com>
+M:     Bartosz Golaszewski <brgl@bgdev.pl>
 L:     linux-gpio@vger.kernel.org
 S:     Maintained
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio.git
@@ -8192,7 +8251,7 @@ T:        git git://linuxtv.org/anttip/media_tree.git
 F:     drivers/media/usb/hackrf/
 
 HANTRO VPU CODEC DRIVER
-M:     Ezequiel Garcia <ezequiel@collabora.com>
+M:     Ezequiel Garcia <ezequiel@vanguardiasur.com.ar>
 M:     Philipp Zabel <p.zabel@pengutronix.de>
 L:     linux-media@vger.kernel.org
 L:     linux-rockchip@lists.infradead.org
@@ -8609,9 +8668,8 @@ F:        Documentation/devicetree/bindings/iio/humidity/st,hts221.yaml
 F:     drivers/iio/humidity/hts221*
 
 HUAWEI ETHERNET DRIVER
-M:     Bin Luo <luobin9@huawei.com>
 L:     netdev@vger.kernel.org
-S:     Supported
+S:     Orphan
 F:     Documentation/networking/device_drivers/ethernet/huawei/hinic.rst
 F:     drivers/net/ethernet/huawei/hinic/
 
@@ -8661,6 +8719,12 @@ S:       Maintained
 T:     git git://linuxtv.org/media_tree.git
 F:     drivers/media/i2c/hi556.c
 
+HYNIX HI846 SENSOR DRIVER
+M:     Martin Kepplinger <martin.kepplinger@puri.sm>
+L:     linux-media@vger.kernel.org
+S:     Maintained
+F:     drivers/media/i2c/hi846.c
+
 Hyper-V/Azure CORE AND DRIVERS
 M:     "K. Y. Srinivasan" <kys@microsoft.com>
 M:     Haiyang Zhang <haiyangz@microsoft.com>
@@ -9303,7 +9367,7 @@ S:        Maintained
 F:     drivers/platform/x86/intel/atomisp2/led.c
 
 INTEL BIOS SAR INT1092 DRIVER
-M:     Shravan S <s.shravan@intel.com>
+M:     Shravan Sudhakar <s.shravan@intel.com>
 M:     Intel Corporation <linuxwwan@intel.com>
 L:     platform-driver-x86@vger.kernel.org
 S:     Maintained
@@ -9480,6 +9544,12 @@ L:       linux-crypto@vger.kernel.org
 S:     Maintained
 F:     drivers/crypto/ixp4xx_crypto.c
 
+INTEL ISHTP ECLITE DRIVER
+M:     Sumesh K Naduvalath <sumesh.k.naduvalath@intel.com>
+L:     platform-driver-x86@vger.kernel.org
+S:     Supported
+F:     drivers/platform/x86/intel/ishtp_eclite.c
+
 INTEL IXP4XX QMGR, NPE, ETHERNET and HSS SUPPORT
 M:     Krzysztof Halasa <khalasa@piap.pl>
 S:     Maintained
@@ -9513,6 +9583,17 @@ F:       drivers/crypto/keembay/keembay-ocs-aes-core.c
 F:     drivers/crypto/keembay/ocs-aes.c
 F:     drivers/crypto/keembay/ocs-aes.h
 
+INTEL KEEM BAY OCS ECC CRYPTO DRIVER
+M:     Daniele Alessandrelli <daniele.alessandrelli@intel.com>
+M:     Prabhjot Khurana <prabhjot.khurana@intel.com>
+M:     Mark Gross <mgross@linux.intel.com>
+S:     Maintained
+F:     Documentation/devicetree/bindings/crypto/intel,keembay-ocs-ecc.yaml
+F:     drivers/crypto/keembay/Kconfig
+F:     drivers/crypto/keembay/Makefile
+F:     drivers/crypto/keembay/keembay-ocs-ecc.c
+F:     drivers/crypto/keembay/ocs-ecc-curve-defs.h
+
 INTEL KEEM BAY OCS HCU CRYPTO DRIVER
 M:     Daniele Alessandrelli <daniele.alessandrelli@intel.com>
 M:     Declan Murphy <declan.murphy@intel.com>
@@ -9625,7 +9706,7 @@ F:        include/uapi/linux/isst_if.h
 F:     tools/power/x86/intel-speed-select/
 
 INTEL STRATIX10 FIRMWARE DRIVERS
-M:     Richard Gong <richard.gong@linux.intel.com>
+M:     Dinh Nguyen <dinguyen@kernel.org>
 L:     linux-kernel@vger.kernel.org
 S:     Maintained
 F:     Documentation/ABI/testing/sysfs-devices-platform-stratix10-rsu
@@ -9996,6 +10077,7 @@ JC42.4 TEMPERATURE SENSOR DRIVER
 M:     Guenter Roeck <linux@roeck-us.net>
 L:     linux-hwmon@vger.kernel.org
 S:     Maintained
+F:     Documentation/devicetree/bindings/hwmon/jedec,jc42.yaml
 F:     Documentation/hwmon/jc42.rst
 F:     drivers/hwmon/jc42.c
 
@@ -10035,6 +10117,7 @@ F:      include/linux/jbd2.h
 JPU V4L2 MEM2MEM DRIVER FOR RENESAS
 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
 
@@ -10195,8 +10278,8 @@ M:      Hyunchul Lee <hyc.lee@gmail.com>
 L:     linux-cifs@vger.kernel.org
 S:     Maintained
 T:     git git://git.samba.org/ksmbd.git
-F:     fs/cifs_common/
 F:     fs/ksmbd/
+F:     fs/smbfs_common/
 
 KERNEL UNIT TESTING FRAMEWORK (KUnit)
 M:     Brendan Higgins <brendanhiggins@google.com>
@@ -10271,11 +10354,22 @@ F:    arch/powerpc/include/uapi/asm/kvm*
 F:     arch/powerpc/kernel/kvm*
 F:     arch/powerpc/kvm/
 
+KERNEL VIRTUAL MACHINE FOR RISC-V (KVM/riscv)
+M:     Anup Patel <anup.patel@wdc.com>
+R:     Atish Patra <atish.patra@wdc.com>
+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
+F:     arch/riscv/include/asm/kvm*
+F:     arch/riscv/include/uapi/asm/kvm*
+F:     arch/riscv/kvm/
+
 KERNEL VIRTUAL MACHINE for s390 (KVM/s390)
 M:     Christian Borntraeger <borntraeger@de.ibm.com>
 M:     Janosch Frank <frankja@linux.ibm.com>
 R:     David Hildenbrand <david@redhat.com>
-R:     Cornelia Huck <cohuck@redhat.com>
 R:     Claudio Imbrenda <imbrenda@linux.ibm.com>
 L:     kvm@vger.kernel.org
 S:     Supported
@@ -10439,10 +10533,13 @@ M:    Anil S Keshavamurthy <anil.s.keshavamurthy@intel.com>
 M:     "David S. Miller" <davem@davemloft.net>
 M:     Masami Hiramatsu <mhiramat@kernel.org>
 S:     Maintained
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace.git
 F:     Documentation/trace/kprobes.rst
 F:     include/asm-generic/kprobes.h
 F:     include/linux/kprobes.h
 F:     kernel/kprobes.c
+F:     lib/test_kprobes.c
+F:     samples/kprobes
 
 KS0108 LCD CONTROLLER DRIVER
 M:     Miguel Ojeda <ojeda@kernel.org>
@@ -10890,7 +10987,7 @@ LM90 HARDWARE MONITOR DRIVER
 M:     Jean Delvare <jdelvare@suse.com>
 L:     linux-hwmon@vger.kernel.org
 S:     Maintained
-F:     Documentation/devicetree/bindings/hwmon/lm90.txt
+F:     Documentation/devicetree/bindings/hwmon/national,lm90.yaml
 F:     Documentation/hwmon/lm90.rst
 F:     drivers/hwmon/lm90.c
 F:     include/dt-bindings/thermal/lm90.h
@@ -11149,6 +11246,7 @@ S:      Maintained
 F:     Documentation/devicetree/bindings/net/dsa/marvell.txt
 F:     Documentation/networking/devlink/mv88e6xxx.rst
 F:     drivers/net/dsa/mv88e6xxx/
+F:     include/linux/dsa/mv88e6xxx.h
 F:     include/linux/platform_data/mv88e6xxx.h
 
 MARVELL ARMADA 3700 PHY DRIVERS
@@ -11273,7 +11371,6 @@ F:      Documentation/networking/device_drivers/ethernet/marvell/octeontx2.rst
 F:     drivers/net/ethernet/marvell/octeontx2/af/
 
 MARVELL PRESTERA ETHERNET SWITCH DRIVER
-M:     Vadym Kochan <vkochan@marvell.com>
 M:     Taras Chornyi <tchornyi@marvell.com>
 S:     Supported
 W:     https://github.com/Marvell-switching/switchdev-prestera
@@ -11368,7 +11465,7 @@ F:      Documentation/devicetree/bindings/iio/proximity/maxbotix,mb1232.yaml
 F:     drivers/iio/proximity/mb1232.c
 
 MAXIM MAX77650 PMIC MFD DRIVER
-M:     Bartosz Golaszewski <bgolaszewski@baylibre.com>
+M:     Bartosz Golaszewski <brgl@bgdev.pl>
 L:     linux-kernel@vger.kernel.org
 S:     Maintained
 F:     Documentation/devicetree/bindings/*/*max77650.yaml
@@ -11674,6 +11771,7 @@ 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/
 
 MEDIA DRIVERS FOR RENESAS - VSP1
@@ -11819,7 +11917,9 @@ F:      drivers/mmc/host/mtk-sd.c
 MEDIATEK MT76 WIRELESS LAN DRIVER
 M:     Felix Fietkau <nbd@nbd.name>
 M:     Lorenzo Bianconi <lorenzo.bianconi83@gmail.com>
-R:     Ryder Lee <ryder.lee@mediatek.com>
+M:     Ryder Lee <ryder.lee@mediatek.com>
+R:     Shayne Chen <shayne.chen@mediatek.com>
+R:     Sean Wang <sean.wang@mediatek.com>
 L:     linux-wireless@vger.kernel.org
 S:     Maintained
 F:     drivers/net/wireless/mediatek/mt76/
@@ -11980,7 +12080,7 @@ F:      drivers/net/ethernet/mellanox/mlxfw/
 
 MELLANOX HARDWARE PLATFORM SUPPORT
 M:     Hans de Goede <hdegoede@redhat.com>
-M:     Mark Gross <mgross@linux.intel.com>
+M:     Mark Gross <markgross@kernel.org>
 M:     Vadim Pasternak <vadimp@nvidia.com>
 L:     platform-driver-x86@vger.kernel.org
 S:     Supported
@@ -12254,6 +12354,12 @@ L:     linux-crypto@vger.kernel.org
 S:     Maintained
 F:     drivers/crypto/atmel-ecc.*
 
+MICROCHIP EIC DRIVER
+M:     Claudiu Beznea <claudiu.beznea@microchip.com>
+L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
+S:     Supported
+F:     drivers/irqchip/irq-mchp-eic.c
+
 MICROCHIP I2C DRIVER
 M:     Codrin Ciubotariu <codrin.ciubotariu@microchip.com>
 L:     linux-i2c@vger.kernel.org
@@ -12432,7 +12538,7 @@ F:      drivers/platform/surface/surface_gpe.c
 
 MICROSOFT SURFACE HARDWARE PLATFORM SUPPORT
 M:     Hans de Goede <hdegoede@redhat.com>
-M:     Mark Gross <mgross@linux.intel.com>
+M:     Mark Gross <markgross@kernel.org>
 M:     Maximilian Luz <luzmaximilian@gmail.com>
 L:     platform-driver-x86@vger.kernel.org
 S:     Maintained
@@ -12749,6 +12855,7 @@ M:      Laurent Pinchart <laurent.pinchart@ideasonboard.com>
 L:     linux-media@vger.kernel.org
 S:     Maintained
 T:     git git://linuxtv.org/media_tree.git
+F:     Documentation/devicetree/bindings/media/i2c/aptina,mt9p031.yaml
 F:     drivers/media/i2c/mt9p031.c
 F:     include/media/i2c/mt9p031.h
 
@@ -13043,6 +13150,7 @@ F:      include/linux/dsa/
 F:     include/linux/platform_data/dsa.h
 F:     include/net/dsa.h
 F:     net/dsa/
+F:     tools/testing/selftests/drivers/net/dsa/
 
 NETWORKING [GENERAL]
 M:     "David S. Miller" <davem@davemloft.net>
@@ -13256,9 +13364,9 @@ F:      Documentation/scsi/NinjaSCSI.rst
 F:     drivers/scsi/nsp32*
 
 NIOS2 ARCHITECTURE
-M:     Ley Foon Tan <ley.foon.tan@intel.com>
+M:     Dinh Nguyen <dinguyen@kernel.org>
 S:     Maintained
-T:     git git://git.kernel.org/pub/scm/linux/kernel/git/lftan/nios2.git
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux.git
 F:     arch/nios2/
 
 NITRO ENCLAVES (NE)
@@ -13384,6 +13492,12 @@ S:     Maintained
 F:     drivers/video/fbdev/nvidia/
 F:     drivers/video/fbdev/riva/
 
+NVIDIA WMI EC BACKLIGHT DRIVER
+M:     Daniel Dadap <ddadap@nvidia.com>
+L:     platform-driver-x86@vger.kernel.org
+S:     Supported
+F:     drivers/platform/x86/nvidia-wmi-ec-backlight.c
+
 NVM EXPRESS DRIVER
 M:     Keith Busch <kbusch@kernel.org>
 M:     Jens Axboe <axboe@fb.com>
@@ -13438,7 +13552,7 @@ M:      Ashish Kumar <ashish.kumar@nxp.com>
 R:     Yogesh Gaur <yogeshgaur.83@gmail.com>
 L:     linux-spi@vger.kernel.org
 S:     Maintained
-F:     Documentation/devicetree/bindings/spi/spi-nxp-fspi.txt
+F:     Documentation/devicetree/bindings/spi/spi-nxp-fspi.yaml
 F:     drivers/spi/spi-nxp-fspi.c
 
 NXP FXAS21002C DRIVER
@@ -13802,6 +13916,13 @@ S:     Maintained
 T:     git git://linuxtv.org/media_tree.git
 F:     drivers/media/i2c/ov13858.c
 
+OMNIVISION OV13B10 SENSOR DRIVER
+M:     Arec Kao <arec.kao@intel.com>
+L:     linux-media@vger.kernel.org
+S:     Maintained
+T:     git git://linuxtv.org/media_tree.git
+F:     drivers/media/i2c/ov13b10.c
+
 OMNIVISION OV2680 SENSOR DRIVER
 M:     Rui Miguel Silva <rmfrfs@gmail.com>
 L:     linux-media@vger.kernel.org
@@ -14344,7 +14465,8 @@ F:      Documentation/devicetree/bindings/pci/intel,ixp4xx-pci.yaml
 F:     drivers/pci/controller/pci-ixp4xx.c
 
 PCI DRIVER FOR INTEL VOLUME MANAGEMENT DEVICE (VMD)
-M:     Jonathan Derrick <jonathan.derrick@intel.com>
+M:     Nirmal Patel <nirmal.patel@linux.intel.com>
+R:     Jonathan Derrick <jonathan.derrick@linux.dev>
 L:     linux-pci@vger.kernel.org
 S:     Supported
 F:     drivers/pci/controller/vmd.c
@@ -14909,7 +15031,6 @@ S:      Maintained
 W:     http://hwmon.wiki.kernel.org/
 W:     http://www.roeck-us.net/linux/drivers/
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git
-F:     Documentation/devicetree/bindings/hwmon/ibm,cffps1.txt
 F:     Documentation/devicetree/bindings/hwmon/ltc2978.txt
 F:     Documentation/devicetree/bindings/hwmon/max31785.txt
 F:     Documentation/hwmon/adm1275.rst
@@ -15458,6 +15579,7 @@ M:      ath9k-devel@qca.qualcomm.com
 L:     linux-wireless@vger.kernel.org
 S:     Supported
 W:     https://wireless.wiki.kernel.org/en/users/Drivers/ath9k
+F:     Documentation/devicetree/bindings/net/wireless/qca,ath9k.yaml
 F:     drivers/net/wireless/ath/ath9k/
 
 QUALCOMM CAMERA SUBSYSTEM DRIVER
@@ -15879,6 +16001,12 @@ L:     linux-wireless@vger.kernel.org
 S:     Maintained
 F:     drivers/net/wireless/realtek/rtw88/
 
+REALTEK WIRELESS DRIVER (rtw89)
+M:     Ping-Ke Shih <pkshih@realtek.com>
+L:     linux-wireless@vger.kernel.org
+S:     Maintained
+F:     drivers/net/wireless/realtek/rtw89/
+
 REDPINE WIRELESS DRIVER
 M:     Amitkumar Karwar <amitkarwar@gmail.com>
 M:     Siva Rebbagondla <siva8118@gmail.com>
@@ -16113,7 +16241,7 @@ F:      include/uapi/linux/rkisp1-config.h
 
 ROCKCHIP RASTER 2D GRAPHIC ACCELERATION UNIT DRIVER
 M:     Jacob Chen <jacob-chen@iotwrt.com>
-M:     Ezequiel Garcia <ezequiel@collabora.com>
+M:     Ezequiel Garcia <ezequiel@vanguardiasur.com.ar>
 L:     linux-media@vger.kernel.org
 L:     linux-rockchip@lists.infradead.org
 S:     Maintained
@@ -16121,7 +16249,7 @@ F:      Documentation/devicetree/bindings/media/rockchip-rga.yaml
 F:     drivers/media/platform/rockchip/rga/
 
 ROCKCHIP VIDEO DECODER DRIVER
-M:     Ezequiel Garcia <ezequiel@collabora.com>
+M:     Ezequiel Garcia <ezequiel@vanguardiasur.com.ar>
 L:     linux-media@vger.kernel.org
 L:     linux-rockchip@lists.infradead.org
 S:     Maintained
@@ -16297,6 +16425,7 @@ S390
 M:     Heiko Carstens <hca@linux.ibm.com>
 M:     Vasily Gorbik <gor@linux.ibm.com>
 M:     Christian Borntraeger <borntraeger@de.ibm.com>
+R:     Alexander Gordeev <agordeev@linux.ibm.com>
 L:     linux-s390@vger.kernel.org
 S:     Supported
 W:     http://www.ibm.com/developerworks/linux/linux390/
@@ -16375,7 +16504,6 @@ F:      drivers/s390/crypto/vfio_ap_ops.c
 F:     drivers/s390/crypto/vfio_ap_private.h
 
 S390 VFIO-CCW DRIVER
-M:     Cornelia Huck <cohuck@redhat.com>
 M:     Eric Farman <farman@linux.ibm.com>
 M:     Matthew Rosato <mjrosato@linux.ibm.com>
 R:     Halil Pasic <pasic@linux.ibm.com>
@@ -16504,10 +16632,10 @@ M:    Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
 L:     linux-kernel@vger.kernel.org
 L:     linux-samsung-soc@vger.kernel.org
 S:     Supported
-F:     Documentation/devicetree/bindings/clock/samsung,s2mps11.txt
+F:     Documentation/devicetree/bindings/clock/samsung,s2mps11.yaml
 F:     Documentation/devicetree/bindings/mfd/samsung,sec-core.txt
-F:     Documentation/devicetree/bindings/regulator/samsung,s2m*.txt
-F:     Documentation/devicetree/bindings/regulator/samsung,s5m*.txt
+F:     Documentation/devicetree/bindings/regulator/samsung,s2m*.yaml
+F:     Documentation/devicetree/bindings/regulator/samsung,s5m*.yaml
 F:     drivers/clk/clk-s2mps11.c
 F:     drivers/mfd/sec*.c
 F:     drivers/regulator/s2m*.c
@@ -16652,13 +16780,6 @@ M:     Lubomir Rintel <lkundrak@v3.sk>
 S:     Supported
 F:     drivers/char/pcmcia/scr24x_cs.c
 
-SCSI CDROM DRIVER
-M:     Jens Axboe <axboe@kernel.dk>
-L:     linux-scsi@vger.kernel.org
-S:     Maintained
-W:     http://www.kernel.dk
-F:     drivers/scsi/sr*
-
 SCSI RDMA PROTOCOL (SRP) INITIATOR
 M:     Bart Van Assche <bvanassche@acm.org>
 L:     linux-rdma@vger.kernel.org
@@ -16798,7 +16919,6 @@ M:      Adrian Hunter <adrian.hunter@intel.com>
 L:     linux-mmc@vger.kernel.org
 S:     Maintained
 F:     drivers/mmc/host/sdhci*
-F:     include/linux/mmc/sdhci*
 
 SECURE DIGITAL HOST CONTROLLER INTERFACE (SDHCI) MICROCHIP DRIVER
 M:     Eugen Hristev <eugen.hristev@microchip.com>
@@ -16957,7 +17077,6 @@ F:      drivers/misc/sgi-xp/
 
 SHARED MEMORY COMMUNICATIONS (SMC) SOCKETS
 M:     Karsten Graul <kgraul@linux.ibm.com>
-M:     Guvenc Gulce <guvenc@linux.ibm.com>
 L:     linux-s390@vger.kernel.org
 S:     Supported
 W:     http://www.ibm.com/developerworks/linux/linux390/
@@ -17802,7 +17921,6 @@ F:      drivers/staging/nvec/
 
 STAGING - OLPC SECONDARY DISPLAY CONTROLLER (DCON)
 M:     Jens Frederich <jfrederich@gmail.com>
-M:     Daniel Drake <dsd@laptop.org>
 M:     Jon Nettleton <jon.nettleton@gmail.com>
 S:     Maintained
 W:     http://wiki.laptop.org/go/DCON
@@ -17893,7 +18011,8 @@ M:      Olivier Moysan <olivier.moysan@foss.st.com>
 M:     Arnaud Pouliquen <arnaud.pouliquen@foss.st.com>
 L:     alsa-devel@alsa-project.org (moderated for non-subscribers)
 S:     Maintained
-F:     Documentation/devicetree/bindings/iio/adc/st,stm32-*.yaml
+F:     Documentation/devicetree/bindings/iio/adc/st,stm32-dfsdm-adc.yaml
+F:     Documentation/devicetree/bindings/sound/st,stm32-*.yaml
 F:     sound/soc/stm/
 
 STM32 TIMER/LPTIMER DRIVERS
@@ -17970,10 +18089,11 @@ F:    Documentation/admin-guide/svga.rst
 F:     arch/x86/boot/video*
 
 SWIOTLB SUBSYSTEM
-M:     Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
+M:     Christoph Hellwig <hch@infradead.org>
 L:     iommu@lists.linux-foundation.org
 S:     Supported
-T:     git git://git.kernel.org/pub/scm/linux/kernel/git/konrad/swiotlb.git
+W:     http://git.infradead.org/users/hch/dma-mapping.git
+T:     git git://git.infradead.org/users/hch/dma-mapping.git
 F:     arch/*/kernel/pci-swiotlb.c
 F:     include/linux/swiotlb.h
 F:     kernel/dma/swiotlb.c
@@ -17989,7 +18109,7 @@ F:      net/switchdev/
 SY8106A REGULATOR DRIVER
 M:     Icenowy Zheng <icenowy@aosc.io>
 S:     Maintained
-F:     Documentation/devicetree/bindings/regulator/sy8106a-regulator.txt
+F:     Documentation/devicetree/bindings/regulator/silergy,sy8106a.yaml
 F:     drivers/regulator/sy8106a-regulator.c
 
 SYNC FILE FRAMEWORK
@@ -18461,7 +18581,7 @@ S:      Supported
 F:     drivers/net/ethernet/tehuti/*
 
 TELECOM CLOCK DRIVER FOR MCPL0010
-M:     Mark Gross <mark.gross@intel.com>
+M:     Mark Gross <markgross@kernel.org>
 S:     Supported
 F:     drivers/char/tlclk.c
 
@@ -18556,14 +18676,17 @@ T:    git git://linuxtv.org/media_tree.git
 F:     drivers/media/radio/radio-raremono.c
 
 THERMAL
-M:     Zhang Rui <rui.zhang@intel.com>
+M:     Rafael J. Wysocki <rafael@kernel.org>
 M:     Daniel Lezcano <daniel.lezcano@linaro.org>
 R:     Amit Kucheria <amitk@kernel.org>
+R:     Zhang Rui <rui.zhang@intel.com>
 L:     linux-pm@vger.kernel.org
 S:     Supported
 Q:     https://patchwork.kernel.org/project/linux-pm/list/
-T:     git git://git.kernel.org/pub/scm/linux/kernel/git/thermal/linux.git
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git thermal
+F:     Documentation/ABI/testing/sysfs-class-thermal
 F:     Documentation/devicetree/bindings/thermal/
+F:     Documentation/driver-api/thermal/
 F:     drivers/thermal/
 F:     include/linux/cpu_cooling.h
 F:     include/linux/thermal.h
@@ -18691,7 +18814,7 @@ F:      include/linux/clk/ti.h
 
 TI DAVINCI MACHINE SUPPORT
 M:     Sekhar Nori <nsekhar@ti.com>
-R:     Bartosz Golaszewski <bgolaszewski@baylibre.com>
+R:     Bartosz Golaszewski <brgl@bgdev.pl>
 L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:     Supported
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci.git
@@ -18976,7 +19099,7 @@ TRACING
 M:     Steven Rostedt <rostedt@goodmis.org>
 M:     Ingo Molnar <mingo@redhat.com>
 S:     Maintained
-T:     git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git perf/core
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace.git
 F:     Documentation/trace/ftrace.rst
 F:     arch/*/*/*/ftrace.h
 F:     arch/*/kernel/ftrace.c
@@ -19290,13 +19413,12 @@ S:    Maintained
 F:     drivers/usb/misc/chaoskey.c
 
 USB CYPRESS C67X00 DRIVER
-M:     Peter Korsgaard <jacmet@sunsite.dk>
 L:     linux-usb@vger.kernel.org
-S:     Maintained
+S:     Orphan
 F:     drivers/usb/c67x00/
 
 USB DAVICOM DM9601 DRIVER
-M:     Peter Korsgaard <jacmet@sunsite.dk>
+M:     Peter Korsgaard <peter@korsgaard.com>
 L:     netdev@vger.kernel.org
 S:     Maintained
 W:     http://www.linux-usb.org/usbnet
@@ -20338,6 +20460,7 @@ X86 ARCHITECTURE (32-BIT AND 64-BIT)
 M:     Thomas Gleixner <tglx@linutronix.de>
 M:     Ingo Molnar <mingo@redhat.com>
 M:     Borislav Petkov <bp@alien8.de>
+M:     Dave Hansen <dave.hansen@linux.intel.com>
 M:     x86@kernel.org
 R:     "H. Peter Anvin" <hpa@zytor.com>
 L:     linux-kernel@vger.kernel.org
@@ -20377,7 +20500,7 @@ F:      arch/x86/mm/
 
 X86 PLATFORM DRIVERS
 M:     Hans de Goede <hdegoede@redhat.com>
-M:     Mark Gross <mgross@linux.intel.com>
+M:     Mark Gross <markgross@kernel.org>
 L:     platform-driver-x86@vger.kernel.org
 S:     Maintained
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git
@@ -20476,7 +20599,6 @@ F:      samples/bpf/xdpsock*
 F:     tools/lib/bpf/xsk*
 
 XEN BLOCK SUBSYSTEM
-M:     Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
 M:     Roger Pau Monné <roger.pau@citrix.com>
 L:     xen-devel@lists.xenproject.org (moderated for non-subscribers)
 S:     Supported
@@ -20524,7 +20646,7 @@ S:      Supported
 F:     drivers/net/xen-netback/*
 
 XEN PCI SUBSYSTEM
-M:     Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
+M:     Juergen Gross <jgross@suse.com>
 L:     xen-devel@lists.xenproject.org (moderated for non-subscribers)
 S:     Supported
 F:     arch/x86/pci/*xen*
@@ -20547,7 +20669,8 @@ S:      Supported
 F:     sound/xen/*
 
 XEN SWIOTLB SUBSYSTEM
-M:     Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
+M:     Juergen Gross <jgross@suse.com>
+M:     Stefano Stabellini <sstabellini@kernel.org>
 L:     xen-devel@lists.xenproject.org (moderated for non-subscribers)
 L:     iommu@lists.linux-foundation.org
 S:     Supported
@@ -20706,7 +20829,6 @@ S:      Maintained
 F:     mm/zbud.c
 
 ZD1211RW WIRELESS DRIVER
-M:     Daniel Drake <dsd@gentoo.org>
 M:     Ulrich Kunitz <kune@deine-taler.de>
 L:     linux-wireless@vger.kernel.org
 L:     zd1211-devs@lists.sourceforge.net (subscribers-only)
Domain: System / Kernel;