Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf
[sfrench/cifs-2.6.git] / MAINTAINERS
index d0ed735994a54fabb37ca9677e861ed261ab621e..2854d42288e906ec9ea36cc385503f44bf3d15b6 100644 (file)
@@ -321,7 +321,7 @@ F:  drivers/pnp/pnpacpi/
 F:     include/linux/acpi.h
 F:     include/linux/fwnode.h
 F:     include/acpi/
-F:     Documentation/acpi/
+F:     Documentation/firmware-guide/acpi/
 F:     Documentation/ABI/testing/sysfs-bus-acpi
 F:     Documentation/ABI/testing/configfs-acpi
 F:     drivers/pci/*acpi*
@@ -551,6 +551,7 @@ W:  http://wiki.analog.com/ADXL345
 W:     http://ez.analog.com/community/linux-device-drivers
 S:     Supported
 F:     drivers/input/misc/adxl34x.c
+F:     Documentation/devicetree/bindings/iio/accel/adi,adxl345.yaml
 
 ADXL372 THREE-AXIS DIGITAL ACCELEROMETER DRIVER
 M:     Stefan Popa <stefan.popa@analog.com>
@@ -559,7 +560,7 @@ S:  Supported
 F:     drivers/iio/accel/adxl372.c
 F:     drivers/iio/accel/adxl372_spi.c
 F:     drivers/iio/accel/adxl372_i2c.c
-F:     Documentation/devicetree/bindings/iio/accel/adxl372.txt
+F:     Documentation/devicetree/bindings/iio/accel/adi,adxl372.yaml
 
 AF9013 MEDIA DRIVER
 M:     Antti Palosaari <crope@iki.fi>
@@ -668,6 +669,13 @@ S: Maintained
 F:     Documentation/i2c/busses/i2c-ali1563
 F:     drivers/i2c/busses/i2c-ali1563.c
 
+ALLEGRO DVT VIDEO IP CORE DRIVER
+M:     Michael Tretter <m.tretter@pengutronix.de>
+R:     Pengutronix Kernel Team <kernel@pengutronix.de>
+L:     linux-media@vger.kernel.org
+S:     Maintained
+F:     drivers/staging/media/allegro-dvt/
+
 ALLWINNER SECURITY SYSTEM
 M:     Corentin Labbe <clabbe.montjoie@gmail.com>
 L:     linux-crypto@vger.kernel.org
@@ -909,8 +917,17 @@ S: Supported
 F:     drivers/iio/adc/ad7768-1.c
 F:     Documentation/devicetree/bindings/iio/adc/adi,ad7768-1.txt
 
+ANALOG DEVICES INC AD7780 DRIVER
+M:     Michael Hennerich <Michael.Hennerich@analog.com>
+M:     Renato Lui Geh <renatogeh@gmail.com>
+L:     linux-iio@vger.kernel.org
+W:     http://ez.analog.com/community/linux-device-drivers
+S:     Supported
+F:     drivers/iio/adc/ad7780.c
+F:     Documentation/devicetree/bindings/iio/adc/adi,ad7780.yaml
+
 ANALOG DEVICES INC AD9389B DRIVER
-M:     Hans Verkuil <hans.verkuil@cisco.com>
+M:     Hans Verkuil <hverkuil-cisco@xs4all.nl>
 L:     linux-media@vger.kernel.org
 S:     Maintained
 F:     drivers/media/i2c/ad9389b*
@@ -921,6 +938,13 @@ S: Supported
 F:     drivers/mux/adgs1408.c
 F:     Documentation/devicetree/bindings/mux/adi,adgs1408.txt
 
+ANALOG DEVICES INC ADIS DRIVER LIBRARY
+M:     Alexandru Ardelean <alexandru.ardelean@analog.com>
+S:     Supported
+L:     linux-iio@vger.kernel.org
+F:     include/linux/iio/imu/adis.h
+F:     drivers/iio/imu/adis.c
+
 ANALOG DEVICES INC ADP5061 DRIVER
 M:     Stefan Popa <stefan.popa@analog.com>
 L:     linux-pm@vger.kernel.org
@@ -942,19 +966,19 @@ S:        Maintained
 F:     drivers/media/i2c/adv748x/*
 
 ANALOG DEVICES INC ADV7511 DRIVER
-M:     Hans Verkuil <hans.verkuil@cisco.com>
+M:     Hans Verkuil <hverkuil-cisco@xs4all.nl>
 L:     linux-media@vger.kernel.org
 S:     Maintained
 F:     drivers/media/i2c/adv7511*
 
 ANALOG DEVICES INC ADV7604 DRIVER
-M:     Hans Verkuil <hans.verkuil@cisco.com>
+M:     Hans Verkuil <hverkuil-cisco@xs4all.nl>
 L:     linux-media@vger.kernel.org
 S:     Maintained
 F:     drivers/media/i2c/adv7604*
 
 ANALOG DEVICES INC ADV7842 DRIVER
-M:     Hans Verkuil <hans.verkuil@cisco.com>
+M:     Hans Verkuil <hverkuil-cisco@xs4all.nl>
 L:     linux-media@vger.kernel.org
 S:     Maintained
 F:     drivers/media/i2c/adv7842*
@@ -1140,6 +1164,15 @@ L:       linux-media@vger.kernel.org
 S:     Maintained
 F:     drivers/media/i2c/aptina-pll.*
 
+AQUANTIA ETHERNET DRIVER (atlantic)
+M:     Igor Russkikh <igor.russkikh@aquantia.com>
+L:     netdev@vger.kernel.org
+S:     Supported
+W:     http://www.aquantia.com
+Q:     http://patchwork.ozlabs.org/project/netdev/list/
+F:     drivers/net/ethernet/aquantia/atlantic/
+F:     Documentation/networking/device_drivers/aquantia/atlantic.txt
+
 ARC FRAMEBUFFER DRIVER
 M:     Jaya Kumar <jayalk@intworks.biz>
 S:     Maintained
@@ -1290,7 +1323,7 @@ ARM PRIMECELL SSP PL022 SPI DRIVER
 M:     Linus Walleij <linus.walleij@linaro.org>
 L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:     Maintained
-F:     Documentation/devicetree/bindings/spi/spi_pl022.txt
+F:     Documentation/devicetree/bindings/spi/spi-pl022.yaml
 F:     drivers/spi/spi-pl022.c
 
 ARM PRIMECELL UART PL010 AND PL011 DRIVERS
@@ -1306,6 +1339,12 @@ S:       Maintained
 F:     Documentation/devicetree/bindings/interrupt-controller/arm,vic.txt
 F:     drivers/irqchip/irq-vic.c
 
+AMAZON ANNAPURNA LABS FIC DRIVER
+M:     Talel Shenhar <talel@amazon.com>
+S:     Maintained
+F:     Documentation/devicetree/bindings/interrupt-controller/amazon,al-fic.txt
+F:     drivers/irqchip/irq-al-fic.c
+
 ARM SMMU DRIVERS
 M:     Will Deacon <will@kernel.org>
 R:     Robin Murphy <robin.murphy@arm.com>
@@ -2101,7 +2140,7 @@ F:        arch/arm/boot/dts/rda8810pl-*
 F:     drivers/clocksource/timer-rda.c
 F:     drivers/irqchip/irq-rda-intc.c
 F:     drivers/tty/serial/rda-uart.c
-F:     Documentation/devicetree/bindings/arm/rda.txt
+F:     Documentation/devicetree/bindings/arm/rda.yaml
 F:     Documentation/devicetree/bindings/interrupt-controller/rda,8810pl-intc.txt
 F:     Documentation/devicetree/bindings/serial/rda,8810pl-uart.txt
 F:     Documentation/devicetree/bindings/timer/rda,8810pl-timer.txt
@@ -2344,7 +2383,7 @@ L:        linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:     Maintained
 
 ARM/TEGRA HDMI CEC SUBSYSTEM SUPPORT
-M:     Hans Verkuil <hans.verkuil@cisco.com>
+M:     Hans Verkuil <hverkuil-cisco@xs4all.nl>
 L:     linux-tegra@vger.kernel.org
 L:     linux-media@vger.kernel.org
 S:     Maintained
@@ -2586,6 +2625,15 @@ S:       Maintained
 F:     Documentation/hwmon/asc7621.rst
 F:     drivers/hwmon/asc7621.c
 
+ASPEED PINCTRL DRIVERS
+M:     Andrew Jeffery <andrew@aj.id.au>
+L:     linux-aspeed@lists.ozlabs.org (moderated for non-subscribers)
+L:     openbmc@lists.ozlabs.org (moderated for non-subscribers)
+L:     linux-gpio@vger.kernel.org
+S:     Maintained
+F:     drivers/pinctrl/aspeed/
+F:     Documentation/devicetree/bindings/pinctrl/aspeed,*
+
 ASPEED VIDEO ENGINE DRIVER
 M:     Eddie James <eajames@linux.ibm.com>
 L:     linux-media@vger.kernel.org
@@ -3060,9 +3108,9 @@ S:        Maintained
 F:     arch/riscv/net/
 
 BPF JIT for S390
+M:     Ilya Leoshkevich <iii@linux.ibm.com>
 M:     Heiko Carstens <heiko.carstens@de.ibm.com>
 M:     Vasily Gorbik <gor@linux.ibm.com>
-M:     Christian Borntraeger <borntraeger@de.ibm.com>
 L:     netdev@vger.kernel.org
 L:     bpf@vger.kernel.org
 S:     Maintained
@@ -3122,6 +3170,7 @@ F:        arch/arm/mach-bcm/
 BROADCOM BCM2835 ARM ARCHITECTURE
 M:     Eric Anholt <eric@anholt.net>
 M:     Stefan Wahren <wahrenst@gmx.net>
+L:     bcm-kernel-feedback-list@broadcom.com
 L:     linux-rpi-kernel@lists.infradead.org (moderated for non-subscribers)
 L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 T:     git git://github.com/anholt/linux
@@ -3151,6 +3200,7 @@ F:        arch/arm/boot/dts/bcm953012*
 
 BROADCOM BCM53573 ARM ARCHITECTURE
 M:     Rafał Miłecki <rafal@milecki.pl>
+L:     bcm-kernel-feedback-list@broadcom.com
 L:     linux-arm-kernel@lists.infradead.org
 S:     Maintained
 F:     arch/arm/boot/dts/bcm53573*
@@ -3677,7 +3727,7 @@ F:        drivers/crypto/ccree/
 W:     https://developer.arm.com/products/system-ip/trustzone-cryptocell/cryptocell-700-family
 
 CEC FRAMEWORK
-M:     Hans Verkuil <hans.verkuil@cisco.com>
+M:     Hans Verkuil <hverkuil-cisco@xs4all.nl>
 L:     linux-media@vger.kernel.org
 T:     git git://linuxtv.org/media_tree.git
 W:     http://linuxtv.org
@@ -3694,7 +3744,7 @@ F:        Documentation/devicetree/bindings/media/cec.txt
 F:     Documentation/ABI/testing/debugfs-cec-error-inj
 
 CEC GPIO DRIVER
-M:     Hans Verkuil <hans.verkuil@cisco.com>
+M:     Hans Verkuil <hverkuil-cisco@xs4all.nl>
 L:     linux-media@vger.kernel.org
 T:     git git://linuxtv.org/media_tree.git
 W:     http://linuxtv.org
@@ -3751,7 +3801,7 @@ F:        scripts/extract-cert.c
 CERTIFIED WIRELESS USB (WUSB) SUBSYSTEM:
 L:     linux-usb@vger.kernel.org
 S:     Orphan
-F:     Documentation/usb/WUSB-Design-overview.txt
+F:     Documentation/usb/wusb-design-overview.rst
 F:     Documentation/usb/wusb-cbaf
 F:     drivers/usb/host/hwa-hc.c
 F:     drivers/usb/host/whci/
@@ -3886,7 +3936,7 @@ F:        Documentation/devicetree/bindings/hwmon/cirrus,lochnagar.txt
 F:     Documentation/devicetree/bindings/pinctrl/cirrus,lochnagar.txt
 F:     Documentation/devicetree/bindings/regulator/cirrus,lochnagar.txt
 F:     Documentation/devicetree/bindings/sound/cirrus,lochnagar.txt
-F:     Documentation/hwmon/lochnagar
+F:     Documentation/hwmon/lochnagar.rst
 
 CISCO FCOE HBA DRIVER
 M:     Satish Kharat <satishkh@cisco.com>
@@ -3927,19 +3977,32 @@ W:      https://github.com/CirrusLogic/linux-drivers/wiki
 S:     Supported
 F:     Documentation/devicetree/bindings/mfd/madera.txt
 F:     Documentation/devicetree/bindings/pinctrl/cirrus,madera-pinctrl.txt
+F:     Documentation/devicetree/bindings/sound/madera.txt
+F:     include/dt-bindings/sound/madera*
 F:     include/linux/irqchip/irq-madera*
 F:     include/linux/mfd/madera/*
+F:     include/sound/madera*
 F:     drivers/gpio/gpio-madera*
 F:     drivers/irqchip/irq-madera*
 F:     drivers/mfd/madera*
 F:     drivers/mfd/cs47l*
 F:     drivers/pinctrl/cirrus/*
+F:     sound/soc/codecs/cs47l*
+F:     sound/soc/codecs/madera*
 
 CLANG-FORMAT FILE
 M:     Miguel Ojeda <miguel.ojeda.sandonis@gmail.com>
 S:     Maintained
 F:     .clang-format
 
+CLANG/LLVM BUILD SUPPORT
+L:     clang-built-linux@googlegroups.com
+W:     https://clangbuiltlinux.github.io/
+B:     https://github.com/ClangBuiltLinux/linux/issues
+C:     irc://chat.freenode.net/clangbuiltlinux
+S:     Supported
+K:     \b(?i:clang|llvm)\b
+
 CLEANCACHE API
 M:     Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
 L:     linux-kernel@vger.kernel.org
@@ -3970,7 +4033,7 @@ S:        Supported
 F:     drivers/platform/x86/classmate-laptop.c
 
 COBALT MEDIA DRIVER
-M:     Hans Verkuil <hans.verkuil@cisco.com>
+M:     Hans Verkuil <hverkuil-cisco@xs4all.nl>
 L:     linux-media@vger.kernel.org
 T:     git git://linuxtv.org/media_tree.git
 W:     https://linuxtv.org
@@ -4106,7 +4169,7 @@ W:        http://www.bullopensource.org/cpuset/
 W:     http://oss.sgi.com/projects/cpusets/
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git
 S:     Maintained
-F:     Documentation/cgroup-v1/cpusets.txt
+F:     Documentation/cgroup-v1/cpusets.rst
 F:     include/linux/cpuset.h
 F:     kernel/cgroup/cpuset.c
 
@@ -4241,6 +4304,7 @@ F:        crypto/
 F:     drivers/crypto/
 F:     include/crypto/
 F:     include/linux/crypto*
+F:     lib/crypto/
 
 CRYPTOGRAPHIC RANDOM NUMBER GENERATOR
 M:     Neil Horman <nhorman@tuxdriver.com>
@@ -4697,6 +4761,7 @@ F:        Documentation/devicetree/bindings/mfd/da90*.txt
 F:     Documentation/devicetree/bindings/input/da90??-onkey.txt
 F:     Documentation/devicetree/bindings/thermal/da90??-thermal.txt
 F:     Documentation/devicetree/bindings/regulator/da92*.txt
+F:     Documentation/devicetree/bindings/regulator/slg51000.txt
 F:     Documentation/devicetree/bindings/watchdog/da90??-wdt.txt
 F:     Documentation/devicetree/bindings/sound/da[79]*.txt
 F:     drivers/gpio/gpio-da90??.c
@@ -4712,6 +4777,7 @@ F:        drivers/power/supply/da9052-battery.c
 F:     drivers/power/supply/da91??-*.c
 F:     drivers/regulator/da903x.c
 F:     drivers/regulator/da9???-regulator.[ch]
+F:     drivers/regulator/slg51000-regulator.[ch]
 F:     drivers/thermal/da90??-thermal.c
 F:     drivers/rtc/rtc-da90??.c
 F:     drivers/video/backlight/da90??_bl.c
@@ -4789,7 +4855,7 @@ S:        Maintained
 W:     http://plugable.com/category/projects/udlfb/
 F:     drivers/video/fbdev/udlfb.c
 F:     include/video/udlfb.h
-F:     Documentation/fb/udlfb.txt
+F:     Documentation/fb/udlfb.rst
 
 DISTRIBUTED LOCK MANAGER (DLM)
 M:     Christine Caulfield <ccaulfie@redhat.com>
@@ -4862,7 +4928,7 @@ S:        Maintained
 F:     Documentation/
 F:     scripts/kernel-doc
 X:     Documentation/ABI/
-X:     Documentation/acpi/
+X:     Documentation/firmware-guide/acpi/
 X:     Documentation/devicetree/
 X:     Documentation/i2c/
 X:     Documentation/media/
@@ -4922,13 +4988,6 @@ L:       linux-kernel@vger.kernel.org
 S:     Maintained
 F:     drivers/staging/fsl-dpaa2/ethsw
 
-DPAA2 PTP CLOCK DRIVER
-M:     Yangbo Lu <yangbo.lu@nxp.com>
-L:     netdev@vger.kernel.org
-S:     Maintained
-F:     drivers/net/ethernet/freescale/dpaa2/dpaa2-ptp*
-F:     drivers/net/ethernet/freescale/dpaa2/dprtc*
-
 DPT_I2O SCSI RAID DRIVER
 M:     Adaptec OEM Raid Solutions <aacraid@microsemi.com>
 L:     linux-scsi@vger.kernel.org
@@ -5600,7 +5659,8 @@ F:        include/linux/dynamic_debug.h
 DYNAMIC INTERRUPT MODERATION
 M:     Tal Gilboa <talgi@mellanox.com>
 S:     Maintained
-F:     include/linux/net_dim.h
+F:     include/linux/dim.h
+F:     lib/dim/
 
 DZ DECSTATION DZ11 SERIAL DRIVER
 M:     "Maciej W. Rozycki" <macro@linux-mips.org>
@@ -5809,6 +5869,12 @@ L:       linux-edac@vger.kernel.org
 S:     Maintained
 F:     drivers/edac/sb_edac.c
 
+EDAC-SIFIVE
+M:     Yash Shah <yash.shah@sifive.com>
+L:     linux-edac@vger.kernel.org
+S:     Supported
+F:     drivers/edac/sifive_edac.c
+
 EDAC-SKYLAKE
 M:     Tony Luck <tony.luck@intel.com>
 L:     linux-edac@vger.kernel.org
@@ -5968,6 +6034,7 @@ M:        Heiner Kallweit <hkallweit1@gmail.com>
 L:     netdev@vger.kernel.org
 S:     Maintained
 F:     Documentation/ABI/testing/sysfs-bus-mdio
+F:     Documentation/devicetree/bindings/net/ethernet-phy.yaml
 F:     Documentation/devicetree/bindings/net/mdio*
 F:     Documentation/networking/phy.rst
 F:     drivers/net/phy/
@@ -6032,7 +6099,7 @@ S:        Maintained
 F:     drivers/extcon/
 F:     include/linux/extcon/
 F:     include/linux/extcon.h
-F:     Documentation/extcon/
+F:     Documentation/firmware-guide/acpi/extcon-intel-int3496.rst
 F:     Documentation/devicetree/bindings/extcon/
 
 EXYNOS DP DRIVER
@@ -6218,6 +6285,14 @@ M:       Philip Kelleher <pjk1939@linux.ibm.com>
 S:     Maintained
 F:     drivers/block/rsxx/
 
+FLEXTIMER FTM-QUADDEC DRIVER
+M:     Patrick Havelange <patrick.havelange@essensium.com>
+L:     linux-iio@vger.kernel.org
+S:     Maintained
+F:     Documentation/ABI/testing/sysfs-bus-counter-ftm-quadddec
+F:     Documentation/devicetree/bindings/counter/ftm-quaddec.txt
+F:     drivers/counter/ftm-quaddec.c
+
 FLOPPY DRIVER
 M:     Jiri Kosina <jikos@kernel.org>
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/floppy.git
@@ -6250,7 +6325,7 @@ FPGA DFL DRIVERS
 M:     Wu Hao <hao.wu@intel.com>
 L:     linux-fpga@vger.kernel.org
 S:     Maintained
-F:     Documentation/fpga/dfl.txt
+F:     Documentation/fpga/dfl.rst
 F:     include/uapi/linux/fpga-dfl.h
 F:     drivers/fpga/dfl*
 
@@ -6327,6 +6402,13 @@ L:       linux-i2c@vger.kernel.org
 S:     Maintained
 F:     drivers/i2c/busses/i2c-cpm.c
 
+FREESCALE IMX DDR PMU DRIVER
+M:     Frank Li <Frank.li@nxp.com>
+L:     linux-arm-kernel@lists.infradead.org
+S:     Maintained
+F:     drivers/perf/fsl_imx8_ddr_perf.c
+F:     Documentation/devicetree/bindings/perf/fsl-imx-ddr.txt
+
 FREESCALE IMX LPI2C DRIVER
 M:     Dong Aisheng <aisheng.dong@nxp.com>
 L:     linux-i2c@vger.kernel.org
@@ -6370,6 +6452,8 @@ FREESCALE QORIQ PTP CLOCK DRIVER
 M:     Yangbo Lu <yangbo.lu@nxp.com>
 L:     netdev@vger.kernel.org
 S:     Maintained
+F:     drivers/net/ethernet/freescale/dpaa2/dpaa2-ptp*
+F:     drivers/net/ethernet/freescale/dpaa2/dprtc*
 F:     drivers/net/ethernet/freescale/enetc/enetc_ptp.c
 F:     drivers/ptp/ptp_qoriq.c
 F:     drivers/ptp/ptp_qoriq_debugfs.c
@@ -6488,6 +6572,19 @@ F:       fs/crypto/
 F:     include/linux/fscrypt*.h
 F:     Documentation/filesystems/fscrypt.rst
 
+FSI SUBSYSTEM
+M:     Jeremy Kerr <jk@ozlabs.org>
+M:     Joel Stanley <joel@jms.id.au>
+R:     Alistar Popple <alistair@popple.id.au>
+R:     Eddie James <eajames@linux.ibm.com>
+L:     linux-fsi@lists.ozlabs.org
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/joel/fsi.git
+Q:     http://patchwork.ozlabs.org/project/linux-fsi/list/
+S:     Supported
+F:     drivers/fsi/
+F:     include/linux/fsi*.h
+F:     include/trace/events/fsi*.h
+
 FSI-ATTACHED I2C DRIVER
 M:     Eddie James <eajames@linux.ibm.com>
 L:     linux-i2c@vger.kernel.org
@@ -6664,6 +6761,18 @@ L:       kvm@vger.kernel.org
 S:     Supported
 F:     drivers/uio/uio_pci_generic.c
 
+GENERIC VDSO LIBRARY:
+M:     Andy Lutomirski <luto@kernel.org>
+M:     Thomas Gleixner <tglx@linutronix.de>
+M:     Vincenzo Frascino <vincenzo.frascino@arm.com>
+L:     linux-kernel@vger.kernel.org
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git timers/vdso
+S:     Maintained
+F:     lib/vdso/
+F:     kernel/time/vsyscall.c
+F:     include/vdso/
+F:     include/asm-generic/vdso/vsyscall.h
+
 GENWQE (IBM Generic Workqueue Card)
 M:     Frank Haverkamp <haver@linux.ibm.com>
 S:     Supported
@@ -6690,9 +6799,7 @@ M:        Paul Bolle <pebolle@tiscali.nl>
 L:     gigaset307x-common@lists.sourceforge.net
 W:     http://gigaset307x.sourceforge.net/
 S:     Odd Fixes
-F:     Documentation/isdn/README.gigaset
-F:     drivers/isdn/gigaset/
-F:     include/uapi/linux/gigaset_dev.h
+F:     drivers/staging/isdn/gigaset/
 
 GNSS SUBSYSTEM
 M:     Johan Hovold <johan@kernel.org>
@@ -6704,7 +6811,7 @@ F:        drivers/gnss/
 F:     include/linux/gnss.h
 
 GO7007 MPEG CODEC
-M:     Hans Verkuil <hans.verkuil@cisco.com>
+M:     Hans Verkuil <hverkuil-cisco@xs4all.nl>
 L:     linux-media@vger.kernel.org
 S:     Maintained
 F:     drivers/media/usb/go7007/
@@ -6715,6 +6822,15 @@ L:       linux-input@vger.kernel.org
 S:     Maintained
 F:     drivers/input/touchscreen/goodix.c
 
+GOOGLE ETHERNET DRIVERS
+M:     Catherine Sullivan <csully@google.com>
+R:     Sagi Shahar <sagis@google.com>
+R:     Jon Olson <jonolson@google.com>
+L:     netdev@vger.kernel.org
+S:     Supported
+F:     Documentation/networking/device_drivers/google/gve.txt
+F:     drivers/net/ethernet/google
+
 GPD POCKET FAN DRIVER
 M:     Hans de Goede <hdegoede@redhat.com>
 L:     platform-driver-x86@vger.kernel.org
@@ -7008,7 +7124,7 @@ F:        drivers/media/usb/hdpvr/
 HEWLETT PACKARD ENTERPRISE ILO NMI WATCHDOG DRIVER
 M:     Jerry Hoemann <jerry.hoemann@hpe.com>
 S:     Supported
-F:     Documentation/watchdog/hpwdt.txt
+F:     Documentation/watchdog/hpwdt.rst
 F:     drivers/watchdog/hpwdt.c
 
 HEWLETT-PACKARD SMART ARRAY RAID DRIVER (hpsa)
@@ -7191,7 +7307,7 @@ F:        drivers/net/ethernet/hp/hp100.*
 HPET:  High Precision Event Timers driver
 M:     Clemens Ladisch <clemens@ladisch.de>
 S:     Maintained
-F:     Documentation/timers/hpet.txt
+F:     Documentation/timers/hpet.rst
 F:     drivers/char/hpet.c
 F:     include/linux/hpet.h
 F:     include/uapi/linux/hpet.h
@@ -7301,6 +7417,7 @@ F:        arch/x86/include/asm/trace/hyperv.h
 F:     arch/x86/include/asm/hyperv-tlfs.h
 F:     arch/x86/kernel/cpu/mshyperv.c
 F:     arch/x86/hyperv
+F:     drivers/clocksource/hyperv_timer.c
 F:     drivers/hid/hid-hyperv.c
 F:     drivers/hv/
 F:     drivers/input/serio/hyperv-keyboard.c
@@ -7311,11 +7428,21 @@ F:      drivers/uio/uio_hv_generic.c
 F:     drivers/video/fbdev/hyperv_fb.c
 F:     drivers/iommu/hyperv_iommu.c
 F:     net/vmw_vsock/hyperv_transport.c
+F:     include/clocksource/hyperv_timer.h
 F:     include/linux/hyperv.h
 F:     include/uapi/linux/hyperv.h
+F:     include/asm-generic/mshyperv.h
 F:     tools/hv/
 F:     Documentation/ABI/stable/sysfs-bus-vmbus
 
+HYPERBUS SUPPORT
+M:     Vignesh Raghavendra <vigneshr@ti.com>
+S:     Supported
+F:     drivers/mtd/hyperbus/
+F:     include/linux/mtd/hyperbus.h
+F:     Documentation/devicetree/bindings/mtd/cypress,hyperflash.txt
+F:     Documentation/devicetree/bindings/mtd/ti,am654-hbmc.txt
+
 HYPERVISOR VIRTUAL CONSOLE DRIVER
 L:     linuxppc-dev@lists.ozlabs.org
 S:     Odd Fixes
@@ -7609,7 +7736,7 @@ IDE/ATAPI DRIVERS
 M:     Borislav Petkov <bp@alien8.de>
 L:     linux-ide@vger.kernel.org
 S:     Maintained
-F:     Documentation/cdrom/ide-cd
+F:     Documentation/cdrom/ide-cd.rst
 F:     drivers/ide/ide-cd*
 
 IDEAPAD LAPTOP EXTRAS DRIVER
@@ -7772,6 +7899,12 @@ W:       http://industrypack.sourceforge.net
 S:     Maintained
 F:     drivers/ipack/
 
+INFINEON DPS310 Driver
+M:     Eddie James <eajames@linux.ibm.com>
+L:     linux-iio@vger.kernel.org
+F:     drivers/iio/pressure/dps310.c
+S:     Maintained
+
 INFINIBAND SUBSYSTEM
 M:     Doug Ledford <dledford@redhat.com>
 M:     Jason Gunthorpe <jgg@mellanox.com>
@@ -7800,7 +7933,7 @@ INGENIC JZ4780 NAND DRIVER
 M:     Harvey Hunt <harveyhuntnexus@gmail.com>
 L:     linux-mtd@lists.infradead.org
 S:     Maintained
-F:     drivers/mtd/nand/raw/jz4780_*
+F:     drivers/mtd/nand/raw/ingenic/
 
 INOTIFY
 M:     Jan Kara <jack@suse.cz>
@@ -7922,7 +8055,7 @@ INTEL FRAMEBUFFER DRIVER (excluding 810 and 815)
 M:     Maik Broemme <mbroemme@libmpq.org>
 L:     linux-fbdev@vger.kernel.org
 S:     Maintained
-F:     Documentation/fb/intelfb.txt
+F:     Documentation/fb/intelfb.rst
 F:     drivers/video/fbdev/intelfb/
 
 INTEL GPIO DRIVERS
@@ -8033,7 +8166,7 @@ F:        include/uapi/linux/mei.h
 F:     include/linux/mei_cl_bus.h
 F:     drivers/misc/mei/*
 F:     drivers/watchdog/mei_wdt.c
-F:     Documentation/misc-devices/mei/*
+F:     Documentation/driver-api/mei/*
 F:     samples/mei/*
 
 INTEL MENLOW THERMAL DRIVER
@@ -8374,18 +8507,26 @@ S:      Supported
 W:     http://www.linux-iscsi.org
 F:     drivers/infiniband/ulp/isert
 
-ISDN SUBSYSTEM
+ISDN/mISDN SUBSYSTEM
 M:     Karsten Keil <isdn@linux-pingi.de>
 L:     isdn4linux@listserv.isdn4linux.de (subscribers-only)
 L:     netdev@vger.kernel.org
 W:     http://www.isdn4linux.de
-T:     git git://git.kernel.org/pub/scm/linux/kernel/git/kkeil/isdn-2.6.git
 S:     Maintained
+F:     drivers/isdn/mISDN
+F:     drivers/isdn/hardware
+
+ISDN/CAPI SUBSYSTEM
+M:     Karsten Keil <isdn@linux-pingi.de>
+L:     isdn4linux@listserv.isdn4linux.de (subscribers-only)
+L:     netdev@vger.kernel.org
+W:     http://www.isdn4linux.de
+S:     Odd Fixes
 F:     Documentation/isdn/
-F:     drivers/isdn/
-F:     include/linux/isdn.h
+F:     drivers/isdn/capi/
+F:     drivers/staging/isdn/
+F:     net/bluetooth/cmtp/
 F:     include/linux/isdn/
-F:     include/uapi/linux/isdn.h
 F:     include/uapi/linux/isdn/
 
 IT87 HARDWARE MONITORING DRIVER
@@ -8858,7 +8999,7 @@ F:        include/linux/leds.h
 LEGACY EEPROM DRIVER
 M:     Jean Delvare <jdelvare@suse.com>
 S:     Maintained
-F:     Documentation/misc-devices/eeprom
+F:     Documentation/misc-devices/eeprom.rst
 F:     drivers/misc/eeprom/eeprom.c
 
 LEGO MINDSTORMS EV3
@@ -9144,7 +9285,7 @@ F:        Documentation/memory-barriers.txt
 LIS3LV02D ACCELEROMETER DRIVER
 M:     Eric Piel <eric.piel@tremplin-utc.net>
 S:     Maintained
-F:     Documentation/misc-devices/lis3lv02d
+F:     Documentation/misc-devices/lis3lv02d.rst
 F:     drivers/misc/lis3lv02d/
 F:     drivers/platform/x86/hp_accel.c
 
@@ -9635,6 +9776,17 @@ L:       linux-iio@vger.kernel.org
 S:     Maintained
 F:     drivers/iio/dac/cio-dac.c
 
+MEDIA CONTROLLER FRAMEWORK
+M:     Sakari Ailus <sakari.ailus@linux.intel.com>
+M:     Laurent Pinchart <laurent.pinchart@ideasonboard.com>
+L:     linux-media@vger.kernel.org
+W:     https://www.linuxtv.org
+T:     git git://linuxtv.org/media_tree.git
+S:     Supported
+F:     drivers/media/mc/
+F:     include/media/media-*.h
+F:     include/uapi/linux/media.h
+
 MEDIA DRIVERS FOR ASCOT2E
 M:     Sergey Kozlov <serjk@netup.ru>
 M:     Abylay Ospan <aospan@netup.ru>
@@ -10101,6 +10253,7 @@ Q:      http://patchwork.ozlabs.org/project/netdev/list/
 S:     Supported
 F:     drivers/net/ethernet/mellanox/mlx5/core/
 F:     include/linux/mlx5/
+F:     Documentation/networking/device_drivers/mellanox/
 
 MELLANOX MLX5 IB driver
 M:     Leon Romanovsky <leonro@mellanox.com>
@@ -10127,7 +10280,7 @@ L:      linux-leds@vger.kernel.org
 S:     Supported
 F:     drivers/leds/leds-mlxcpld.c
 F:     drivers/leds/leds-mlxreg.c
-F:     Documentation/leds/leds-mlxcpld.txt
+F:     Documentation/leds/leds-mlxcpld.rst
 
 MELLANOX PLATFORM DRIVER
 M:     Vadim Pasternak <vadimp@mellanox.com>
@@ -10211,7 +10364,7 @@ F:      drivers/watchdog/menz69_wdt.c
 
 MESON AO CEC DRIVER FOR AMLOGIC SOCS
 M:     Neil Armstrong <narmstrong@baylibre.com>
-L:     linux-media@lists.freedesktop.org
+L:     linux-media@vger.kernel.org
 L:     linux-amlogic@lists.infradead.org
 W:     http://linux-meson.com/
 S:     Supported
@@ -10227,6 +10380,14 @@ S:     Maintained
 F:     drivers/mtd/nand/raw/meson_*
 F:     Documentation/devicetree/bindings/mtd/amlogic,meson-nand.txt
 
+MESON VIDEO DECODER DRIVER FOR AMLOGIC SOCS
+M:     Maxime Jourdan <mjourdan@baylibre.com>
+L:     linux-media@vger.kernel.org
+L:     linux-amlogic@lists.infradead.org
+S:     Supported
+F:     drivers/staging/media/meson/vdec/
+T:     git git://linuxtv.org/media_tree.git
+
 METHODE UDPU SUPPORT
 M:     Vladimir Vid <vladimir.vid@sartura.hr>
 S:     Maintained
@@ -10280,7 +10441,9 @@ MICROCHIP ISC DRIVER
 M:     Eugen Hristev <eugen.hristev@microchip.com>
 L:     linux-media@vger.kernel.org
 S:     Supported
-F:     drivers/media/platform/atmel/atmel-isc.c
+F:     drivers/media/platform/atmel/atmel-sama5d2-isc.c
+F:     drivers/media/platform/atmel/atmel-isc.h
+F:     drivers/media/platform/atmel/atmel-isc-base.c
 F:     drivers/media/platform/atmel/atmel-isc-regs.h
 F:     Documentation/devicetree/bindings/media/atmel-isc.txt
 
@@ -10864,7 +11027,7 @@ F:      drivers/net/ethernet/neterion/
 
 NETFILTER
 M:     Pablo Neira Ayuso <pablo@netfilter.org>
-M:     Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
+M:     Jozsef Kadlecsik <kadlec@netfilter.org>
 M:     Florian Westphal <fw@strlen.de>
 L:     netfilter-devel@vger.kernel.org
 L:     coreteam@netfilter.org
@@ -11077,6 +11240,15 @@ L:     netdev@vger.kernel.org
 S:     Supported
 F:     drivers/net/ethernet/qlogic/netxen/
 
+NEXTHOP
+M:     David Ahern <dsahern@kernel.org>
+L:     netdev@vger.kernel.org
+S:     Maintained
+F:     include/net/nexthop.h
+F:     include/uapi/linux/nexthop.h
+F:     include/net/netns/nexthop.h
+F:     net/ipv4/nexthop.c
+
 NFC SUBSYSTEM
 L:     netdev@vger.kernel.org
 S:     Orphan
@@ -11106,7 +11278,7 @@ F:      include/uapi/linux/nfs*
 F:     include/uapi/linux/sunrpc/
 
 NILFS2 FILESYSTEM
-M:     Ryusuke Konishi <konishi.ryusuke@lab.ntt.co.jp>
+M:     Ryusuke Konishi <konishi.ryusuke@gmail.com>
 L:     linux-nilfs@vger.kernel.org
 W:     https://nilfs.sourceforge.io/
 W:     https://nilfs.osdn.jp/
@@ -11280,7 +11452,7 @@ NXP FXAS21002C DRIVER
 M:     Rui Miguel Silva <rmfrfs@gmail.com>
 L:     linux-iio@vger.kernel.org
 S:     Maintained
-F:     Documentation/devicetree/bindings/iio/gyroscope/fxas21002c.txt
+F:     Documentation/devicetree/bindings/iio/gyroscope/nxp,fxas21002c.txt
 F:     drivers/iio/gyro/fxas21002c_core.c
 F:     drivers/iio/gyro/fxas21002c.h
 F:     drivers/iio/gyro/fxas21002c_i2c.c
@@ -11670,16 +11842,6 @@ S:     Maintained
 F:     drivers/mtd/nand/onenand/
 F:     include/linux/mtd/onenand*.h
 
-ONSTREAM SCSI TAPE DRIVER
-M:     Willem Riede <osst@riede.org>
-L:     osst-users@lists.sourceforge.net
-L:     linux-scsi@vger.kernel.org
-S:     Maintained
-F:     Documentation/scsi/osst.txt
-F:     drivers/scsi/osst.*
-F:     drivers/scsi/osst_*.h
-F:     drivers/scsi/st.h
-
 OP-TEE DRIVER
 M:     Jens Wiklander <jens.wiklander@linaro.org>
 S:     Maintained
@@ -11870,6 +12032,14 @@ F:     kernel/padata.c
 F:     include/linux/padata.h
 F:     Documentation/padata.txt
 
+PAGE POOL
+M:     Jesper Dangaard Brouer <hawk@kernel.org>
+M:     Ilias Apalodimas <ilias.apalodimas@linaro.org>
+L:     netdev@vger.kernel.org
+S:     Supported
+F:     net/core/page_pool.c
+F:     include/net/page_pool.h
+
 PANASONIC LAPTOP ACPI EXTRAS DRIVER
 M:     Harald Welte <laforge@gnumonks.org>
 L:     platform-driver-x86@vger.kernel.org
@@ -12563,8 +12733,7 @@ S:      Orphan
 F:     drivers/scsi/pmcraid.*
 
 PMC SIERRA PM8001 DRIVER
-M:     Jack Wang <jinpu.wang@profitbricks.com>
-M:     lindar_liu@usish.com
+M:     Jack Wang <jinpu.wang@cloud.ionos.com>
 L:     linux-scsi@vger.kernel.org
 S:     Supported
 F:     drivers/scsi/pm8001/
@@ -12658,7 +12827,7 @@ M:      Rodolfo Giometti <giometti@enneenne.com>
 W:     http://wiki.enneenne.com/index.php/LinuxPPS_support
 L:     linuxpps@ml.enneenne.com (subscribers-only)
 S:     Maintained
-F:     Documentation/pps/
+F:     Documentation/driver-api/pps.rst
 F:     Documentation/devicetree/bindings/pps/pps-gpio.txt
 F:     Documentation/ABI/testing/sysfs-pps
 F:     drivers/pps/
@@ -12764,7 +12933,7 @@ L:      netdev@vger.kernel.org
 S:     Maintained
 W:     http://linuxptp.sourceforge.net/
 F:     Documentation/ABI/testing/sysfs-ptp
-F:     Documentation/ptp/*
+F:     Documentation/driver-api/ptp.rst
 F:     drivers/net/phy/dp83640*
 F:     drivers/ptp/*
 F:     include/linux/ptp_cl*
@@ -12778,7 +12947,6 @@ F:      include/linux/regset.h
 F:     include/linux/tracehook.h
 F:     include/uapi/linux/ptrace.h
 F:     include/uapi/linux/ptrace.h
-F:     include/asm-generic/ptrace.h
 F:     kernel/ptrace.c
 F:     arch/*/ptrace*.c
 F:     arch/*/*/ptrace*.c
@@ -13496,11 +13664,11 @@ S:    Maintained
 F:     drivers/media/platform/rockchip/rga/
 F:     Documentation/devicetree/bindings/media/rockchip-rga.txt
 
-ROCKCHIP VPU CODEC DRIVER
+HANTRO VPU CODEC DRIVER
 M:     Ezequiel Garcia <ezequiel@collabora.com>
 L:     linux-media@vger.kernel.org
 S:     Maintained
-F:     drivers/staging/media/platform/rockchip/vpu/
+F:     drivers/staging/media/platform/hantro/
 F:     Documentation/devicetree/bindings/media/rockchip-vpu.txt
 
 ROCKER DRIVER
@@ -13701,7 +13869,7 @@ L:      linux-s390@vger.kernel.org
 L:     kvm@vger.kernel.org
 S:     Supported
 F:     drivers/s390/cio/vfio_ccw*
-F:     Documentation/s390/vfio-ccw.txt
+F:     Documentation/s390/vfio-ccw.rst
 F:     include/uapi/linux/vfio_ccw.h
 
 S390 ZCRYPT DRIVER
@@ -13721,7 +13889,7 @@ S:      Supported
 F:     drivers/s390/crypto/vfio_ap_drv.c
 F:     drivers/s390/crypto/vfio_ap_private.h
 F:     drivers/s390/crypto/vfio_ap_ops.c
-F:     Documentation/s390/vfio-ap.txt
+F:     Documentation/s390/vfio-ap.rst
 
 S390 ZFCP DRIVER
 M:     Steffen Maier <maier@linux.ibm.com>
@@ -14160,6 +14328,12 @@ S:     Maintained
 F:     drivers/misc/phantom.c
 F:     include/uapi/linux/phantom.h
 
+SENSIRION SPS30 AIR POLLUTION SENSOR DRIVER
+M:     Tomasz Duszynski <tduszyns@gmail.com>
+S:     Maintained
+F:     drivers/iio/chemical/sps30.c
+F:     Documentation/devicetree/bindings/iio/chemical/sensirion,sps30.yaml
+
 SERIAL DEVICE BUS
 M:     Rob Herring <robh@kernel.org>
 L:     linux-serial@vger.kernel.org
@@ -14358,7 +14532,7 @@ M:      Sudip Mukherjee <sudip.mukherjee@codethink.co.uk>
 L:     linux-fbdev@vger.kernel.org
 S:     Maintained
 F:     drivers/video/fbdev/sm712*
-F:     Documentation/fb/sm712fb.txt
+F:     Documentation/fb/sm712fb.rst
 
 SIMPLE FIRMWARE INTERFACE (SFI)
 M:     Len Brown <lenb@kernel.org>
@@ -14428,7 +14602,7 @@ SIS FRAMEBUFFER DRIVER
 M:     Thomas Winischhofer <thomas@winischhofer.net>
 W:     http://www.winischhofer.net/linuxsisvga.shtml
 S:     Maintained
-F:     Documentation/fb/sisfb.txt
+F:     Documentation/fb/sisfb.rst
 F:     drivers/video/fbdev/sis/
 F:     include/video/sisfb.h
 
@@ -14615,11 +14789,20 @@ F:    Documentation/devicetree/bindings/net/socionext,uniphier-ave4.txt
 
 SOCIONEXT (SNI) NETSEC NETWORK DRIVER
 M:     Jassi Brar <jaswinder.singh@linaro.org>
+M:     Ilias Apalodimas <ilias.apalodimas@linaro.org>
 L:     netdev@vger.kernel.org
 S:     Maintained
 F:     drivers/net/ethernet/socionext/netsec.c
 F:     Documentation/devicetree/bindings/net/socionext-netsec.txt
 
+SOCIONEXT (SNI) Synquacer SPI DRIVER
+M:     Masahisa Kojima <masahisa.kojima@linaro.org>
+M:     Jassi Brar <jaswinder.singh@linaro.org>
+L:     linux-spi@vger.kernel.org
+S:     Maintained
+F:     drivers/spi/spi-synquacer.c
+F:     Documentation/devicetree/bindings/spi/spi-synquacer.txt
+
 SOLIDRUN CLEARFOG SUPPORT
 M:     Russell King <linux@armlinux.org.uk>
 S:     Maintained
@@ -14926,6 +15109,17 @@ L:     linux-erofs@lists.ozlabs.org
 S:     Maintained
 F:     drivers/staging/erofs/
 
+STAGING - FIELDBUS SUBSYSTEM
+M:     Sven Van Asbroeck <TheSven73@gmail.com>
+S:     Maintained
+F:     drivers/staging/fieldbus/*
+F:     drivers/staging/fieldbus/Documentation/
+
+STAGING - HMS ANYBUS-S BUS
+M:     Sven Van Asbroeck <TheSven73@gmail.com>
+S:     Maintained
+F:     drivers/staging/fieldbus/anybuss/
+
 STAGING - INDUSTRIAL IO
 M:     Jonathan Cameron <jic23@kernel.org>
 L:     linux-iio@vger.kernel.org
@@ -15493,6 +15687,7 @@ F:      drivers/dma/tegra*
 
 TEGRA I2C DRIVER
 M:     Laxman Dewangan <ldewangan@nvidia.com>
+R:     Dmitry Osipenko <digetx@gmail.com>
 S:     Supported
 F:     drivers/i2c/busses/i2c-tegra.c
 
@@ -16246,7 +16441,7 @@ USB ACM DRIVER
 M:     Oliver Neukum <oneukum@suse.com>
 L:     linux-usb@vger.kernel.org
 S:     Maintained
-F:     Documentation/usb/acm.txt
+F:     Documentation/usb/acm.rst
 F:     drivers/usb/class/cdc-acm.*
 
 USB AR5523 WIRELESS DRIVER
@@ -16299,7 +16494,7 @@ USB EHCI DRIVER
 M:     Alan Stern <stern@rowland.harvard.edu>
 L:     linux-usb@vger.kernel.org
 S:     Maintained
-F:     Documentation/usb/ehci.txt
+F:     Documentation/usb/ehci.rst
 F:     drivers/usb/host/ehci*
 
 USB GADGET/PERIPHERAL SUBSYSTEM
@@ -16317,7 +16512,7 @@ M:      Benjamin Tissoires <benjamin.tissoires@redhat.com>
 L:     linux-usb@vger.kernel.org
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/hid/hid.git
 S:     Maintained
-F:     Documentation/hid/hiddev.txt
+F:     Documentation/hid/hiddev.rst
 F:     drivers/hid/usbhid/
 
 USB INTEL XHCI ROLE MUX DRIVER
@@ -16373,7 +16568,7 @@ USB OHCI DRIVER
 M:     Alan Stern <stern@rowland.harvard.edu>
 L:     linux-usb@vger.kernel.org
 S:     Maintained
-F:     Documentation/usb/ohci.txt
+F:     Documentation/usb/ohci.rst
 F:     drivers/usb/host/ohci*
 
 USB OTG FSM (Finite State Machine)
@@ -16389,7 +16584,7 @@ M:      Shuah Khan <shuah@kernel.org>
 M:     Shuah Khan <skhan@linuxfoundation.org>
 L:     linux-usb@vger.kernel.org
 S:     Maintained
-F:     Documentation/usb/usbip_protocol.txt
+F:     Documentation/usb/usbip_protocol.rst
 F:     drivers/usb/usbip/
 F:     tools/usb/usbip/
 F:     tools/testing/selftests/drivers/usb/usbip/
@@ -16437,7 +16632,7 @@ M:      Johan Hovold <johan@kernel.org>
 L:     linux-usb@vger.kernel.org
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git
 S:     Maintained
-F:     Documentation/usb/usb-serial.txt
+F:     Documentation/usb/usb-serial.rst
 F:     drivers/usb/serial/
 F:     include/linux/usb/serial.h
 
@@ -16616,7 +16811,7 @@ M:      Michal Januszewski <spock@gentoo.org>
 L:     linux-fbdev@vger.kernel.org
 W:     https://github.com/mjanusz/v86d
 S:     Maintained
-F:     Documentation/fb/uvesafb.txt
+F:     Documentation/fb/uvesafb.rst
 F:     drivers/video/fbdev/uvesafb.*
 
 VF610 NAND DRIVER
@@ -16691,7 +16886,7 @@ S:      Maintained
 F:     drivers/net/ethernet/via/via-velocity.*
 
 VICODEC VIRTUAL CODEC DRIVER
-M:     Hans Verkuil <hans.verkuil@cisco.com>
+M:     Hans Verkuil <hverkuil-cisco@xs4all.nl>
 L:     linux-media@vger.kernel.org
 T:     git git://linuxtv.org/media_tree.git
 W:     https://linuxtv.org
@@ -16714,6 +16909,7 @@ VIDEOBUF2 FRAMEWORK
 M:     Pawel Osciak <pawel@osciak.com>
 M:     Marek Szyprowski <m.szyprowski@samsung.com>
 M:     Kyungmin Park <kyungmin.park@samsung.com>
+R:     Tomasz Figa <tfiga@chromium.org>
 L:     linux-media@vger.kernel.org
 S:     Maintained
 F:     drivers/media/common/videobuf2/*
@@ -17272,6 +17468,7 @@ N:      xdp
 XDP SOCKETS (AF_XDP)
 M:     Björn Töpel <bjorn.topel@intel.com>
 M:     Magnus Karlsson <magnus.karlsson@intel.com>
+R:     Jonathan Lemon <jonathan.lemon@gmail.com>
 L:     netdev@vger.kernel.org
 L:     bpf@vger.kernel.org
 S:     Maintained
@@ -17365,7 +17562,13 @@ W:     http://xfs.org/
 T:     git git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git
 S:     Supported
 F:     Documentation/filesystems/xfs.txt
+F:     Documentation/ABI/testing/sysfs-fs-xfs
+F:     Documentation/filesystems/xfs.txt
+F:     Documentation/filesystems/xfs-delayed-logging-design.txt
+F:     Documentation/filesystems/xfs-self-describing-metadata.txt
 F:     fs/xfs/
+F:     include/uapi/linux/dqblk_xfs.h
+F:     include/uapi/linux/fsmap.h
 
 XILINX AXI ETHERNET DRIVER
 M:     Anirudha Sarangi <anirudh@xilinx.com>
@@ -17485,6 +17688,12 @@ Q:     https://patchwork.linuxtv.org/project/linux-media/list/
 S:     Maintained
 F:     drivers/media/dvb-frontends/zd1301_demod*
 
+ZHAOXIN PROCESSOR SUPPORT
+M:     Tony W Wang-oc <TonyWWang-oc@zhaoxin.com>
+L:     linux-kernel@vger.kernel.org
+S:     Maintained
+F:     arch/x86/kernel/cpu/zhaoxin.c
+
 ZPOOL COMPRESSED PAGE STORAGE API
 M:     Dan Streetman <ddstreet@ieee.org>
 L:     linux-mm@kvack.org