Merge branch 'next-general' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris...
[sfrench/cifs-2.6.git] / MAINTAINERS
index 6fd9e0015dac246492ca36bb24405ee5232b1fc3..09d47cd02a146bbfe8c7d039ad9fb53f6ce0a74e 100644 (file)
@@ -331,6 +331,7 @@ ACPI APEI
 M:     "Rafael J. Wysocki" <rjw@rjwysocki.net>
 M:     Len Brown <lenb@kernel.org>
 L:     linux-acpi@vger.kernel.org
+R:     James Morse <james.morse@arm.com>
 R:     Tony Luck <tony.luck@intel.com>
 R:     Borislav Petkov <bp@alien8.de>
 F:     drivers/acpi/apei/
@@ -409,8 +410,7 @@ F:  drivers/platform/x86/wmi.c
 F:     include/uapi/linux/wmi.h
 
 AD1889 ALSA SOUND DRIVER
-M:     Thibaut Varene <T-Bone@parisc-linux.org>
-W:     http://wiki.parisc-linux.org/AD1889
+W:     https://parisc.wiki.kernel.org/index.php/AD1889
 L:     linux-parisc@vger.kernel.org
 S:     Maintained
 F:     sound/pci/ad1889.*
@@ -854,6 +854,22 @@ S: Supported
 F:     drivers/iio/adc/ad7124.c
 F:     Documentation/devicetree/bindings/iio/adc/adi,ad7124.txt
 
+ANALOG DEVICES INC AD7606 DRIVER
+M:     Stefan Popa <stefan.popa@analog.com>
+L:     linux-iio@vger.kernel.org
+W:     http://ez.analog.com/community/linux-device-drivers
+S:     Supported
+F:     drivers/iio/adc/ad7606.c
+F:     Documentation/devicetree/bindings/iio/adc/ad7606.txt
+
+ANALOG DEVICES INC AD7768-1 DRIVER
+M:     Stefan Popa <stefan.popa@analog.com>
+L:     linux-iio@vger.kernel.org
+W:     http://ez.analog.com/community/linux-device-drivers
+S:     Supported
+F:     drivers/iio/adc/ad7768-1.c
+F:     Documentation/devicetree/bindings/iio/adc/adi,ad7768-1.txt
+
 ANALOG DEVICES INC AD9389B DRIVER
 M:     Hans Verkuil <hans.verkuil@cisco.com>
 L:     linux-media@vger.kernel.org
@@ -1037,26 +1053,26 @@ F:      drivers/net/appletalk/
 F:     net/appletalk/
 
 APPLIED MICRO (APM) X-GENE DEVICE TREE SUPPORT
-M:     Duc Dang <dhdang@apm.com>
+M:     Khuong Dinh <khuong@os.amperecomputing.com>
 S:     Supported
 F:     arch/arm64/boot/dts/apm/
 
 APPLIED MICRO (APM) X-GENE SOC EDAC
-M:     Loc Ho <lho@apm.com>
+M:     Khuong Dinh <khuong@os.amperecomputing.com>
 S:     Supported
 F:     drivers/edac/xgene_edac.c
 F:     Documentation/devicetree/bindings/edac/apm-xgene-edac.txt
 
 APPLIED MICRO (APM) X-GENE SOC ETHERNET (V2) DRIVER
-M:     Iyappan Subramanian <isubramanian@apm.com>
-M:     Keyur Chudgar <kchudgar@apm.com>
+M:     Iyappan Subramanian <iyappan@os.amperecomputing.com>
+M:     Keyur Chudgar <keyur@os.amperecomputing.com>
 S:     Supported
 F:     drivers/net/ethernet/apm/xgene-v2/
 
 APPLIED MICRO (APM) X-GENE SOC ETHERNET DRIVER
-M:     Iyappan Subramanian <isubramanian@apm.com>
-M:     Keyur Chudgar <kchudgar@apm.com>
-M:     Quan Nguyen <qnguyen@apm.com>
+M:     Iyappan Subramanian <iyappan@os.amperecomputing.com>
+M:     Keyur Chudgar <keyur@os.amperecomputing.com>
+M:     Quan Nguyen <quan@os.amperecomputing.com>
 S:     Supported
 F:     drivers/net/ethernet/apm/xgene/
 F:     drivers/net/phy/mdio-xgene.c
@@ -1064,7 +1080,7 @@ F:        Documentation/devicetree/bindings/net/apm-xgene-enet.txt
 F:     Documentation/devicetree/bindings/net/apm-xgene-mdio.txt
 
 APPLIED MICRO (APM) X-GENE SOC PMU
-M:     Tai Nguyen <ttnguyen@apm.com>
+M:     Khuong Dinh <khuong@os.amperecomputing.com>
 S:     Supported
 F:     drivers/perf/xgene_pmu.c
 F:     Documentation/perf/xgene-pmu.txt
@@ -1372,6 +1388,13 @@ F:       arch/arm/mach-aspeed/
 F:     arch/arm/boot/dts/aspeed-*
 N:     aspeed
 
+ARM/BITMAIN ARCHITECTURE
+M:     Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
+L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
+S:     Maintained
+F:     arch/arm64/boot/dts/bitmain/
+F:     Documentation/devicetree/bindings/arm/bitmain.yaml
+
 ARM/CALXEDA HIGHBANK ARCHITECTURE
 M:     Rob Herring <robh@kernel.org>
 L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
@@ -1531,21 +1554,14 @@ ARM/FREESCALE IMX / MXC ARM ARCHITECTURE
 M:     Shawn Guo <shawnguo@kernel.org>
 M:     Sascha Hauer <s.hauer@pengutronix.de>
 R:     Pengutronix Kernel Team <kernel@pengutronix.de>
-R:     Fabio Estevam <fabio.estevam@nxp.com>
+R:     Fabio Estevam <festevam@gmail.com>
 R:     NXP Linux Team <linux-imx@nxp.com>
 L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:     Maintained
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux.git
-F:     arch/arm/mach-imx/
-F:     arch/arm/mach-mxs/
-F:     arch/arm/boot/dts/imx*
-F:     arch/arm/configs/imx*_defconfig
-F:     arch/arm64/boot/dts/freescale/imx*
-F:     drivers/clk/imx/
-F:     drivers/firmware/imx/
-F:     drivers/soc/imx/
-F:     include/linux/firmware/imx/
-F:     include/soc/imx/
+N:     imx
+N:     mxs
+X:     drivers/media/i2c/
 
 ARM/FREESCALE VYBRID ARM ARCHITECTURE
 M:     Shawn Guo <shawnguo@kernel.org>
@@ -1737,6 +1753,7 @@ F:        arch/arm/configs/mvebu_*_defconfig
 F:     arch/arm/mach-mvebu/
 F:     arch/arm64/boot/dts/marvell/armada*
 F:     drivers/cpufreq/armada-37xx-cpufreq.c
+F:     drivers/cpufreq/armada-8k-cpufreq.c
 F:     drivers/cpufreq/mvebu-cpufreq.c
 F:     drivers/irqchip/irq-armada-370-xp.c
 F:     drivers/irqchip/irq-mvebu-*
@@ -1948,19 +1965,37 @@ M:      David Brown <david.brown@linaro.org>
 L:     linux-arm-msm@vger.kernel.org
 S:     Maintained
 F:     Documentation/devicetree/bindings/soc/qcom/
+F:     Documentation/devicetree/bindings/*/qcom*
 F:     arch/arm/boot/dts/qcom-*.dts
 F:     arch/arm/boot/dts/qcom-*.dtsi
 F:     arch/arm/mach-qcom/
-F:     arch/arm64/boot/dts/qcom/*
+F:     arch/arm64/boot/dts/qcom/
+F:     drivers/*/qcom/
+F:     drivers/*/qcom*
+F:     drivers/*/*/qcom/
+F:     drivers/*/*/qcom*
+F:     drivers/*/pm8???-*
+F:     drivers/bluetooth/btqcomsmd.c
+F:     drivers/clocksource/timer-qcom.c
+F:     drivers/extcon/extcon-qcom*
+F:     drivers/iommu/msm*
 F:     drivers/i2c/busses/i2c-qup.c
-F:     drivers/clk/qcom/
-F:     drivers/dma/qcom/
-F:     drivers/soc/qcom/
+F:     drivers/i2c/busses/i2c-qcom-geni.c
+F:     drivers/mfd/ssbi.c
+F:     drivers/mmc/host/mmci_qcom*
+F:     drivers/mmc/host/sdhci_msm.c
+F:     drivers/pci/controller/dwc/pcie-qcom.c
+F:     drivers/phy/qualcomm/
+F:     drivers/power/*/msm*
+F:     drivers/reset/reset-qcom-*
+F:     drivers/scsi/ufs/ufs-qcom.*
 F:     drivers/spi/spi-qup.c
+F:     drivers/spi/spi-geni-qcom.c
+F:     drivers/spi/spi-qcom-qspi.c
 F:     drivers/tty/serial/msm_serial.c
-F:     drivers/*/pm8???-*
-F:     drivers/mfd/ssbi.c
-F:     drivers/firmware/qcom_scm*
+F:     drivers/usb/dwc3/dwc3-qcom.c
+F:     include/dt-bindings/*/qcom*
+F:     include/linux/*/qcom*
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux.git
 
 ARM/RADISYS ENP2611 MACHINE SUPPORT
@@ -1997,7 +2032,7 @@ Q:        http://patchwork.kernel.org/project/linux-renesas-soc/list/
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git next
 S:     Supported
 F:     arch/arm64/boot/dts/renesas/
-F:     Documentation/devicetree/bindings/arm/shmobile.txt
+F:     Documentation/devicetree/bindings/arm/renesas.yaml
 F:     drivers/soc/renesas/
 F:     include/linux/soc/renesas/
 
@@ -2109,6 +2144,8 @@ Q:        http://patchwork.kernel.org/project/linux-renesas-soc/list/
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git next
 S:     Supported
 F:     arch/arm/boot/dts/emev2*
+F:     arch/arm/boot/dts/gr-peach*
+F:     arch/arm/boot/dts/iwg20d-q7*
 F:     arch/arm/boot/dts/r7s*
 F:     arch/arm/boot/dts/r8a*
 F:     arch/arm/boot/dts/r9a*
@@ -2116,7 +2153,7 @@ F:        arch/arm/boot/dts/sh*
 F:     arch/arm/configs/shmobile_defconfig
 F:     arch/arm/include/debug/renesas-scif.S
 F:     arch/arm/mach-shmobile/
-F:     Documentation/devicetree/bindings/arm/shmobile.txt
+F:     Documentation/devicetree/bindings/arm/renesas.yaml
 F:     drivers/soc/renesas/
 F:     include/linux/soc/renesas/
 
@@ -2609,6 +2646,7 @@ L:        linux-kernel@vger.kernel.org
 S:     Maintained
 F:     arch/*/include/asm/atomic*.h
 F:     include/*/atomic*.h
+F:     scripts/atomic/
 
 ATTO EXPRESSSAS SAS/SATA RAID SCSI DRIVER
 M:     Bradley Grove <linuxdrivers@attotech.com>
@@ -2848,8 +2886,11 @@ F:       include/uapi/linux/if_bonding.h
 BPF (Safe dynamic programs and tools)
 M:     Alexei Starovoitov <ast@kernel.org>
 M:     Daniel Borkmann <daniel@iogearbox.net>
+R:     Martin KaFai Lau <kafai@fb.com>
+R:     Song Liu <songliubraving@fb.com>
+R:     Yonghong Song <yhs@fb.com>
 L:     netdev@vger.kernel.org
-L:     linux-kernel@vger.kernel.org
+L:     bpf@vger.kernel.org
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf.git
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next.git
 Q:     https://patchwork.ozlabs.org/project/netdev/list/?delegate=77147
@@ -2873,10 +2914,13 @@ F:      samples/bpf/
 F:     tools/bpf/
 F:     tools/lib/bpf/
 F:     tools/testing/selftests/bpf/
+K:     bpf
+N:     bpf
 
 BPF JIT for ARM
 M:     Shubham Bansal <illusionist.neo@gmail.com>
 L:     netdev@vger.kernel.org
+L:     bpf@vger.kernel.org
 S:     Maintained
 F:     arch/arm/net/
 
@@ -2885,18 +2929,21 @@ M:      Daniel Borkmann <daniel@iogearbox.net>
 M:     Alexei Starovoitov <ast@kernel.org>
 M:     Zi Shen Lim <zlim.lnx@gmail.com>
 L:     netdev@vger.kernel.org
+L:     bpf@vger.kernel.org
 S:     Supported
 F:     arch/arm64/net/
 
 BPF JIT for MIPS (32-BIT AND 64-BIT)
 M:     Paul Burton <paul.burton@mips.com>
 L:     netdev@vger.kernel.org
+L:     bpf@vger.kernel.org
 S:     Maintained
 F:     arch/mips/net/
 
 BPF JIT for NFP NICs
 M:     Jakub Kicinski <jakub.kicinski@netronome.com>
 L:     netdev@vger.kernel.org
+L:     bpf@vger.kernel.org
 S:     Supported
 F:     drivers/net/ethernet/netronome/nfp/bpf/
 
@@ -2904,13 +2951,21 @@ BPF JIT for POWERPC (32-BIT AND 64-BIT)
 M:     Naveen N. Rao <naveen.n.rao@linux.ibm.com>
 M:     Sandipan Das <sandipan@linux.ibm.com>
 L:     netdev@vger.kernel.org
+L:     bpf@vger.kernel.org
 S:     Maintained
 F:     arch/powerpc/net/
 
+BPF JIT for RISC-V (RV64G)
+M:     Björn Töpel <bjorn.topel@gmail.com>
+L:     netdev@vger.kernel.org
+S:     Maintained
+F:     arch/riscv/net/
+
 BPF JIT for S390
 M:     Martin Schwidefsky <schwidefsky@de.ibm.com>
 M:     Heiko Carstens <heiko.carstens@de.ibm.com>
 L:     netdev@vger.kernel.org
+L:     bpf@vger.kernel.org
 S:     Maintained
 F:     arch/s390/net/
 X:     arch/s390/net/pnet.c
@@ -2918,12 +2973,14 @@ X:      arch/s390/net/pnet.c
 BPF JIT for SPARC (32-BIT AND 64-BIT)
 M:     David S. Miller <davem@davemloft.net>
 L:     netdev@vger.kernel.org
+L:     bpf@vger.kernel.org
 S:     Maintained
 F:     arch/sparc/net/
 
 BPF JIT for X86 32-BIT
 M:     Wang YanQing <udknight@gmail.com>
 L:     netdev@vger.kernel.org
+L:     bpf@vger.kernel.org
 S:     Maintained
 F:     arch/x86/net/bpf_jit_comp32.c
 
@@ -2931,6 +2988,7 @@ BPF JIT for X86 64-BIT
 M:     Alexei Starovoitov <ast@kernel.org>
 M:     Daniel Borkmann <daniel@iogearbox.net>
 L:     netdev@vger.kernel.org
+L:     bpf@vger.kernel.org
 S:     Supported
 F:     arch/x86/net/
 X:     arch/x86/net/bpf_jit_comp32.c
@@ -3052,8 +3110,8 @@ F:        include/linux/bcm963xx_nvram.h
 F:     include/linux/bcm963xx_tag.h
 
 BROADCOM BNX2 GIGABIT ETHERNET DRIVER
-M:     Rasesh Mody <rasesh.mody@cavium.com>
-M:     Dept-GELinuxNICDev@cavium.com
+M:     Rasesh Mody <rmody@marvell.com>
+M:     GR-Linux-NIC-Dev@marvell.com
 L:     netdev@vger.kernel.org
 S:     Supported
 F:     drivers/net/ethernet/broadcom/bnx2.*
@@ -3072,9 +3130,9 @@ S:        Supported
 F:     drivers/scsi/bnx2i/
 
 BROADCOM BNX2X 10 GIGABIT ETHERNET DRIVER
-M:     Ariel Elior <ariel.elior@cavium.com>
-M:     Sudarsana Kalluru <sudarsana.kalluru@cavium.com>
-M:     everest-linux-l2@cavium.com
+M:     Ariel Elior <aelior@marvell.com>
+M:     Sudarsana Kalluru <skalluru@marvell.com>
+M:     GR-everest-linux-l2@marvell.com
 L:     netdev@vger.kernel.org
 S:     Supported
 F:     drivers/net/ethernet/broadcom/bnx2x/
@@ -3249,9 +3307,9 @@ S:        Supported
 F:     drivers/scsi/bfa/
 
 BROCADE BNA 10 GIGABIT ETHERNET DRIVER
-M:     Rasesh Mody <rasesh.mody@cavium.com>
-M:     Sudarsana Kalluru <sudarsana.kalluru@cavium.com>
-M:     Dept-GELinuxNICDev@cavium.com
+M:     Rasesh Mody <rmody@marvell.com>
+M:     Sudarsana Kalluru <skalluru@marvell.com>
+M:     GR-Linux-NIC-Dev@marvell.com
 L:     netdev@vger.kernel.org
 S:     Supported
 F:     drivers/net/ethernet/brocade/bna/
@@ -3385,9 +3443,8 @@ F:        Documentation/media/v4l-drivers/cafe_ccic*
 F:     drivers/media/platform/marvell-ccic/
 
 CAIF NETWORK LAYER
-M:     Dmitry Tarnyagin <dmitry.tarnyagin@lockless.no>
 L:     netdev@vger.kernel.org
-S:     Supported
+S:     Orphan
 F:     Documentation/networking/caif/
 F:     drivers/net/caif/
 F:     include/uapi/linux/caif/
@@ -3511,7 +3568,6 @@ F:        include/linux/spi/cc2520.h
 F:     Documentation/devicetree/bindings/net/ieee802154/cc2520.txt
 
 CCREE ARM TRUSTZONE CRYPTOCELL REE DRIVER
-M:     Yael Chemla <yael.chemla@foss.arm.com>
 M:     Gilad Ben-Yossef <gilad@benyossef.com>
 L:     linux-crypto@vger.kernel.org
 S:     Supported
@@ -3687,6 +3743,14 @@ N:       cros_ec
 N:     cros-ec
 F:     drivers/power/supply/cros_usbpd-charger.c
 
+CHROMEOS EC CODEC DRIVER
+M:     Cheng-Yi Chiang <cychiang@chromium.org>
+S:     Maintained
+R:     Enric Balletbo i Serra <enric.balletbo@collabora.com>
+R:     Guenter Roeck <groeck@chromium.org>
+F:     Documentation/devicetree/bindings/sound/google,cros-ec-codec.txt
+F:     sound/soc/codecs/cros_ec_codec.*
+
 CIRRUS LOGIC AUDIO CODEC DRIVERS
 M:     Brian Austin <brian.austin@cirrus.com>
 M:     Paul Handrigan <Paul.Handrigan@cirrus.com>
@@ -3906,9 +3970,10 @@ M:       Johannes Weiner <hannes@cmpxchg.org>
 L:     cgroups@vger.kernel.org
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git
 S:     Maintained
-F:     Documentation/cgroup*
+F:     Documentation/admin-guide/cgroup-v2.rst
+F:     Documentation/cgroup-v1/
 F:     include/linux/cgroup*
-F:     kernel/cgroup*
+F:     kernel/cgroup/
 
 CONTROL GROUP - CPUSET
 M:     Li Zefan <lizefan@huawei.com>
@@ -3956,7 +4021,7 @@ M:        Viresh Kumar <viresh.kumar@linaro.org>
 L:     linux-pm@vger.kernel.org
 S:     Maintained
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git
-T:     git git://git.linaro.org/people/vireshk/linux.git (For ARM Updates)
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm.git (For ARM Updates)
 B:     https://bugzilla.kernel.org
 F:     Documentation/admin-guide/pm/cpufreq.rst
 F:     Documentation/admin-guide/pm/intel_pstate.rst
@@ -3978,6 +4043,7 @@ F:        drivers/cpufreq/arm_big_little.c
 CPU POWER MONITORING SUBSYSTEM
 M:     Thomas Renninger <trenn@suse.com>
 M:     Shuah Khan <shuah@kernel.org>
+M:     Shuah Khan <skhan@linuxfoundation.org>
 L:     linux-pm@vger.kernel.org
 S:     Maintained
 F:     tools/power/cpupower/
@@ -4015,6 +4081,7 @@ S:        Maintained
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git
 B:     https://bugzilla.kernel.org
 F:     Documentation/admin-guide/pm/cpuidle.rst
+F:     Documentation/driver-api/pm/cpuidle.rst
 F:     drivers/cpuidle/*
 F:     include/linux/cpuidle.h
 
@@ -4122,7 +4189,7 @@ S:        Maintained
 F:     drivers/media/dvb-frontends/cxd2820r*
 
 CXGB3 ETHERNET DRIVER (CXGB3)
-M:     Arjun Vynipadath <arjun@chelsio.com>
+M:     Vishal Kulkarni <vishal@chelsio.com>
 L:     netdev@vger.kernel.org
 W:     http://www.chelsio.com
 S:     Supported
@@ -4151,7 +4218,7 @@ S:        Supported
 F:     drivers/crypto/chelsio
 
 CXGB4 ETHERNET DRIVER (CXGB4)
-M:     Arjun Vynipadath <arjun@chelsio.com>
+M:     Vishal Kulkarni <vishal@chelsio.com>
 L:     netdev@vger.kernel.org
 W:     http://www.chelsio.com
 S:     Supported
@@ -5180,7 +5247,7 @@ DRM DRIVERS FOR XEN
 M:     Oleksandr Andrushchenko <oleksandr_andrushchenko@epam.com>
 T:     git git://anongit.freedesktop.org/drm/drm-misc
 L:     dri-devel@lists.freedesktop.org
-L:     xen-devel@lists.xen.org
+L:     xen-devel@lists.xenproject.org (moderated for non-subscribers)
 S:     Supported
 F:     drivers/gpu/drm/xen/
 F:     Documentation/gpu/xen-front.rst
@@ -5881,6 +5948,7 @@ L:        linux-fsdevel@vger.kernel.org
 S:     Maintained
 F:     fs/*
 F:     include/linux/fs.h
+F:     include/linux/fs_types.h
 F:     include/uapi/linux/fs.h
 
 FINTEK F75375S HARDWARE MONITOR AND FAN CONTROLLER DRIVER
@@ -6023,6 +6091,12 @@ L:       linuxppc-dev@lists.ozlabs.org
 S:     Maintained
 F:     drivers/dma/fsldma.*
 
+FREESCALE ENETC ETHERNET DRIVERS
+M:     Claudiu Manoil <claudiu.manoil@nxp.com>
+L:     netdev@vger.kernel.org
+S:     Maintained
+F:     drivers/net/ethernet/freescale/enetc/
+
 FREESCALE eTSEC ETHERNET DRIVER (GIANFAR)
 M:     Claudiu Manoil <claudiu.manoil@nxp.com>
 L:     netdev@vger.kernel.org
@@ -6086,15 +6160,17 @@ FREESCALE QORIQ PTP CLOCK DRIVER
 M:     Yangbo Lu <yangbo.lu@nxp.com>
 L:     netdev@vger.kernel.org
 S:     Maintained
+F:     drivers/net/ethernet/freescale/enetc/enetc_ptp.c
 F:     drivers/ptp/ptp_qoriq.c
+F:     drivers/ptp/ptp_qoriq_debugfs.c
 F:     include/linux/fsl/ptp_qoriq.h
 F:     Documentation/devicetree/bindings/ptp/ptp-qoriq.txt
 
 FREESCALE QUAD SPI DRIVER
 M:     Han Xu <han.xu@nxp.com>
-L:     linux-mtd@lists.infradead.org
+L:     linux-spi@vger.kernel.org
 S:     Maintained
-F:     drivers/mtd/spi-nor/fsl-quadspi.c
+F:     drivers/spi/spi-fsl-qspi.c
 
 FREESCALE QUICC ENGINE LIBRARY
 M:     Qiang Zhao <qiang.zhao@nxp.com>
@@ -6145,7 +6221,7 @@ FREESCALE SOC SOUND DRIVERS
 M:     Timur Tabi <timur@kernel.org>
 M:     Nicolin Chen <nicoleotsuka@gmail.com>
 M:     Xiubo Li <Xiubo.Lee@gmail.com>
-R:     Fabio Estevam <fabio.estevam@nxp.com>
+R:     Fabio Estevam <festevam@gmail.com>
 L:     alsa-devel@alsa-project.org (moderated for non-subscribers)
 L:     linuxppc-dev@lists.ozlabs.org
 S:     Maintained
@@ -6641,6 +6717,15 @@ F:       drivers/clocksource/h8300_*.c
 F:     drivers/clk/h8300/
 F:     drivers/irqchip/irq-renesas-h8*.c
 
+HABANALABS PCI DRIVER
+M:     Oded Gabbay <oded.gabbay@gmail.com>
+T:     git https://github.com/HabanaAI/linux.git
+S:     Supported
+F:     drivers/misc/habanalabs/
+F:     include/uapi/misc/habanalabs.h
+F:     Documentation/ABI/testing/sysfs-driver-habanalabs
+F:     Documentation/ABI/testing/debugfs-driver-habanalabs
+
 HACKRF MEDIA DRIVER
 M:     Antti Palosaari <crope@iki.fi>
 L:     linux-media@vger.kernel.org
@@ -6998,7 +7083,7 @@ M:        Haiyang Zhang <haiyangz@microsoft.com>
 M:     Stephen Hemminger <sthemmin@microsoft.com>
 M:     Sasha Levin <sashal@kernel.org>
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git
-L:     devel@linuxdriverproject.org
+L:     linux-hyperv@vger.kernel.org
 S:     Supported
 F:     Documentation/networking/device_drivers/microsoft/netvsc.txt
 F:     arch/x86/include/asm/mshyperv.h
@@ -7163,6 +7248,7 @@ F:        drivers/i2c/i2c-stub.c
 I3C SUBSYSTEM
 M:     Boris Brezillon <bbrezillon@kernel.org>
 L:     linux-i3c@lists.infradead.org
+C:     irc://chat.freenode.net/linux-i3c
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/i3c/linux.git
 S:     Maintained
 F:     Documentation/ABI/testing/sysfs-bus-i3c
@@ -7882,6 +7968,16 @@ L:       linux-gpio@vger.kernel.org
 S:     Maintained
 F:     drivers/gpio/gpio-intel-mid.c
 
+INTERCONNECT API
+M:     Georgi Djakov <georgi.djakov@linaro.org>
+S:     Maintained
+F:     Documentation/interconnect/
+F:     Documentation/devicetree/bindings/interconnect/
+F:     drivers/interconnect/
+F:     include/dt-bindings/interconnect/
+F:     include/linux/interconnect-provider.h
+F:     include/linux/interconnect.h
+
 INVENSENSE MPU-3050 GYROSCOPE DRIVER
 M:     Linus Walleij <linus.walleij@linaro.org>
 L:     linux-iio@vger.kernel.org
@@ -8258,6 +8354,7 @@ F:        include/uapi/linux/sunrpc/
 
 KERNEL SELFTEST FRAMEWORK
 M:     Shuah Khan <shuah@kernel.org>
+M:     Shuah Khan <skhan@linuxfoundation.org>
 L:     linux-kselftest@vger.kernel.org
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git
 Q:     https://patchwork.kernel.org/project/linux-kselftest/list/
@@ -8480,6 +8577,7 @@ L7 BPF FRAMEWORK
 M:     John Fastabend <john.fastabend@gmail.com>
 M:     Daniel Borkmann <daniel@iogearbox.net>
 L:     netdev@vger.kernel.org
+L:     bpf@vger.kernel.org
 S:     Maintained
 F:     include/linux/skmsg.h
 F:     net/core/skmsg.c
@@ -9082,6 +9180,14 @@ F:       drivers/gpu/drm/armada/
 F:     include/uapi/drm/armada_drm.h
 F:     Documentation/devicetree/bindings/display/armada/
 
+MARVELL ARMADA 3700 PHY DRIVERS
+M:     Miquel Raynal <miquel.raynal@bootlin.com>
+S:     Maintained
+F:     drivers/phy/marvell/phy-mvebu-a3700-comphy.c
+F:     drivers/phy/marvell/phy-mvebu-a3700-utmi.c
+F:     Documentation/devicetree/bindings/phy/phy-mvebu-comphy.txt
+F:     Documentation/devicetree/bindings/phy/phy-mvebu-utmi.txt
+
 MARVELL CRYPTO DRIVER
 M:     Boris Brezillon <bbrezillon@kernel.org>
 M:     Arnaud Ebalard <arno@natisbad.org>
@@ -9785,6 +9891,14 @@ F:       kernel/sched/membarrier.c
 F:     include/uapi/linux/membarrier.h
 F:     arch/powerpc/include/asm/membarrier.h
 
+MEMBLOCK
+M:     Mike Rapoport <rppt@linux.ibm.com>
+L:     linux-mm@kvack.org
+S:     Maintained
+F:     include/linux/memblock.h
+F:     mm/memblock.c
+F:     Documentation/core-api/boot-time-mm.rst
+
 MEMORY MANAGEMENT
 L:     linux-mm@kvack.org
 W:     http://www.linux-mm.org
@@ -9851,6 +9965,18 @@ F:       drivers/media/platform/meson/ao-cec.c
 F:     Documentation/devicetree/bindings/media/meson-ao-cec.txt
 T:     git git://linuxtv.org/media_tree.git
 
+MESON NAND CONTROLLER DRIVER FOR AMLOGIC SOCS
+M:     Liang Yang <liang.yang@amlogic.com>
+L:     linux-mtd@lists.infradead.org
+S:     Maintained
+F:     drivers/mtd/nand/raw/meson_*
+F:     Documentation/devicetree/bindings/mtd/amlogic,meson-nand.txt
+
+METHODE UDPU SUPPORT
+M:     Vladimir Vid <vladimir.vid@sartura.hr>
+S:     Maintained
+F:     arch/arm64/boot/dts/marvell/armada-3720-uDPU.dts
+
 MICROBLAZE ARCHITECTURE
 M:     Michal Simek <monstr@monstr.eu>
 W:     http://www.monstr.eu/fdt/
@@ -10575,6 +10701,7 @@ F:      Documentation/devicetree/bindings/net/dsa/
 F:     net/dsa/
 F:     include/net/dsa.h
 F:     include/linux/dsa/
+F:     include/linux/platform_data/dsa.h
 F:     drivers/net/dsa/
 
 NETWORKING [GENERAL]
@@ -10688,9 +10815,9 @@ S:      Maintained
 F:     drivers/net/netdevsim/*
 
 NETXEN (1/10) GbE SUPPORT
-M:     Manish Chopra <manish.chopra@cavium.com>
-M:     Rahul Verma <rahul.verma@cavium.com>
-M:     Dept-GELinuxNICDev@cavium.com
+M:     Manish Chopra <manishc@marvell.com>
+M:     Rahul Verma <rahulv@marvell.com>
+M:     GR-Linux-NIC-Dev@marvell.com
 L:     netdev@vger.kernel.org
 S:     Supported
 F:     drivers/net/ethernet/qlogic/netxen/
@@ -10790,6 +10917,12 @@ F:     drivers/power/supply/bq27xxx_battery_i2c.c
 F:     drivers/power/supply/isp1704_charger.c
 F:     drivers/power/supply/rx51_battery.c
 
+NOLIBC HEADER FILE
+M:     Willy Tarreau <w@1wt.eu>
+S:     Maintained
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/wtarreau/nolibc.git
+F:     tools/include/nolibc/
+
 NTB AMD DRIVER
 M:     Shyam Sundar S K <Shyam-sundar.S-k@amd.com>
 L:     linux-ntb@googlegroups.com
@@ -10891,7 +11024,7 @@ F:      include/linux/nvmem-consumer.h
 F:     include/linux/nvmem-provider.h
 
 NXP SGTL5000 DRIVER
-M:     Fabio Estevam <fabio.estevam@nxp.com>
+M:     Fabio Estevam <festevam@gmail.com>
 L:     alsa-devel@alsa-project.org (moderated for non-subscribers)
 S:     Maintained
 F:     Documentation/devicetree/bindings/sound/sgtl5000.txt
@@ -10929,6 +11062,14 @@ F:     lib/objagg.c
 F:     lib/test_objagg.c
 F:     include/linux/objagg.h
 
+NXP FSPI DRIVER
+R:     Yogesh Gaur <yogeshgaur.83@gmail.com>
+M:     Ashish Kumar <ashish.kumar@nxp.com>
+L:     linux-spi@vger.kernel.org
+S:     Maintained
+F:     drivers/spi/spi-nxp-fspi.c
+F:     Documentation/devicetree/bindings/spi/spi-nxp-fspi.txt
+
 OBJTOOL
 M:     Josh Poimboeuf <jpoimboe@redhat.com>
 M:     Peter Zijlstra <peterz@infradead.org>
@@ -11262,6 +11403,11 @@ M:     Jens Wiklander <jens.wiklander@linaro.org>
 S:     Maintained
 F:     drivers/tee/optee/
 
+OP-TEE RANDOM NUMBER GENERATOR (RNG) DRIVER
+M:     Sumit Garg <sumit.garg@linaro.org>
+S:     Maintained
+F:     drivers/char/hw_random/optee-rng.c
+
 OPA-VNIC DRIVER
 M:     Dennis Dalessandro <dennis.dalessandro@intel.com>
 M:     Niranjana Vishwanathapura <niranjana.vishwanathapura@intel.com>
@@ -11305,10 +11451,12 @@ F:    include/dt-bindings/
 
 OPENCORES I2C BUS DRIVER
 M:     Peter Korsgaard <peter@korsgaard.com>
+M:     Andrew Lunn <andrew@lunn.ch>
 L:     linux-i2c@vger.kernel.org
 S:     Maintained
 F:     Documentation/i2c/busses/i2c-ocores
 F:     drivers/i2c/busses/i2c-ocores.c
+F:     include/linux/platform_data/i2c-ocores.h
 
 OPENRISC ARCHITECTURE
 M:     Jonas Bonn <jonas@southpole.se>
@@ -11479,7 +11627,7 @@ F:      Documentation/blockdev/paride.txt
 F:     drivers/block/paride/
 
 PARISC ARCHITECTURE
-M:     "James E.J. Bottomley" <jejb@parisc-linux.org>
+M:     "James E.J. Bottomley" <James.Bottomley@HansenPartnership.com>
 M:     Helge Deller <deller@gmx.de>
 L:     linux-parisc@vger.kernel.org
 W:     http://www.parisc-linux.org/
@@ -11559,7 +11707,7 @@ F:      Documentation/devicetree/bindings/pci/altera-pcie.txt
 F:     drivers/pci/controller/pcie-altera.c
 
 PCI DRIVER FOR APPLIEDMICRO XGENE
-M:     Tanmay Inamdar <tinamdar@apm.com>
+M:     Toan Le <toan@os.amperecomputing.com>
 L:     linux-pci@vger.kernel.org
 L:     linux-arm-kernel@lists.infradead.org
 S:     Maintained
@@ -11737,7 +11885,7 @@ F:      Documentation/devicetree/bindings/pci/altera-pcie-msi.txt
 F:     drivers/pci/controller/pcie-altera-msi.c
 
 PCI MSI DRIVER FOR APPLIEDMICRO XGENE
-M:     Duc Dang <dhdang@apm.com>
+M:     Toan Le <toan@os.amperecomputing.com>
 L:     linux-pci@vger.kernel.org
 L:     linux-arm-kernel@lists.infradead.org
 S:     Maintained
@@ -12226,14 +12374,6 @@ S:     Maintained
 F:     drivers/net/ppp/pptp.c
 W:     http://sourceforge.net/projects/accel-pptp
 
-PREEMPTIBLE KERNEL
-M:     Robert Love <rml@tech9.net>
-L:     kpreempt-tech@lists.sourceforge.net
-W:     https://www.kernel.org/pub/linux/kernel/people/rml/preempt-kernel
-S:     Supported
-F:     Documentation/preempt-locking.txt
-F:     include/linux/preempt.h
-
 PRINTK
 M:     Petr Mladek <pmladek@suse.com>
 M:     Sergey Senozhatsky <sergey.senozhatsky@gmail.com>
@@ -12474,8 +12614,8 @@ S:      Supported
 F:     drivers/scsi/qedi/
 
 QLOGIC QL4xxx ETHERNET DRIVER
-M:     Ariel Elior <Ariel.Elior@cavium.com>
-M:     everest-linux-l2@cavium.com
+M:     Ariel Elior <aelior@marvell.com>
+M:     GR-everest-linux-l2@marvell.com
 L:     netdev@vger.kernel.org
 S:     Supported
 F:     drivers/net/ethernet/qlogic/qed/
@@ -12483,8 +12623,8 @@ F:      include/linux/qed/
 F:     drivers/net/ethernet/qlogic/qede/
 
 QLOGIC QL4xxx RDMA DRIVER
-M:     Michal Kalderon <Michal.Kalderon@cavium.com>
-M:     Ariel Elior <Ariel.Elior@cavium.com>
+M:     Michal Kalderon <mkalderon@marvell.com>
+M:     Ariel Elior <aelior@marvell.com>
 L:     linux-rdma@vger.kernel.org
 S:     Supported
 F:     drivers/infiniband/hw/qedr/
@@ -12504,7 +12644,7 @@ F:      Documentation/scsi/LICENSE.qla2xxx
 F:     drivers/scsi/qla2xxx/
 
 QLOGIC QLA3XXX NETWORK DRIVER
-M:     Dept-GELinuxNICDev@cavium.com
+M:     GR-Linux-NIC-Dev@marvell.com
 L:     netdev@vger.kernel.org
 S:     Supported
 F:     Documentation/networking/device_drivers/qlogic/LICENSE.qla3xxx
@@ -12518,16 +12658,16 @@ F:    Documentation/scsi/LICENSE.qla4xxx
 F:     drivers/scsi/qla4xxx/
 
 QLOGIC QLCNIC (1/10)Gb ETHERNET DRIVER
-M:     Shahed Shaikh <Shahed.Shaikh@cavium.com>
-M:     Manish Chopra <manish.chopra@cavium.com>
-M:     Dept-GELinuxNICDev@cavium.com
+M:     Shahed Shaikh <shshaikh@marvell.com>
+M:     Manish Chopra <manishc@marvell.com>
+M:     GR-Linux-NIC-Dev@marvell.com
 L:     netdev@vger.kernel.org
 S:     Supported
 F:     drivers/net/ethernet/qlogic/qlcnic/
 
 QLOGIC QLGE 10Gb ETHERNET DRIVER
-M:     Manish Chopra <manish.chopra@cavium.com>
-M:     Dept-GELinuxNICDev@cavium.com
+M:     Manish Chopra <manishc@marvell.com>
+M:     GR-Linux-NIC-Dev@marvell.com
 L:     netdev@vger.kernel.org
 S:     Supported
 F:     drivers/net/ethernet/qlogic/qlge/
@@ -12595,11 +12735,11 @@ F:    Documentation/media/v4l-drivers/qcom_camss.rst
 F:     drivers/media/platform/qcom/camss/
 
 QUALCOMM CPUFREQ DRIVER MSM8996/APQ8096
-M:  Ilia Lin <ilia.lin@gmail.com>
-L:  linux-pm@vger.kernel.org
-S:  Maintained
-F:  Documentation/devicetree/bindings/opp/kryo-cpufreq.txt
-F:  drivers/cpufreq/qcom-cpufreq-kryo.c
+M:     Ilia Lin <ilia.lin@kernel.org>
+L:     linux-pm@vger.kernel.org
+S:     Maintained
+F:     Documentation/devicetree/bindings/opp/kryo-cpufreq.txt
+F:     drivers/cpufreq/qcom-cpufreq-kryo.c
 
 QUALCOMM EMAC GIGABIT ETHERNET DRIVER
 M:     Timur Tabi <timur@kernel.org>
@@ -12607,6 +12747,14 @@ L:     netdev@vger.kernel.org
 S:     Maintained
 F:     drivers/net/ethernet/qualcomm/emac/
 
+QUALCOMM ETHQOS ETHERNET DRIVER
+M:     Vinod Koul <vkoul@kernel.org>
+M:     Niklas Cassel <niklas.cassel@linaro.org>
+L:     netdev@vger.kernel.org
+S:     Maintained
+F:     drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c
+F:     Documentation/devicetree/bindings/net/qcom,dwmac.txt
+
 QUALCOMM GENERIC INTERFACE I2C DRIVER
 M:     Alok Chauhan <alokc@codeaurora.org>
 M:     Karthikeyan Ramasubramanian <kramasub@codeaurora.org>
@@ -12866,6 +13014,13 @@ F:     Documentation/devicetree/bindings/net/dsa/realtek-smi.txt
 F:     drivers/net/dsa/realtek-smi*
 F:     drivers/net/dsa/rtl83*
 
+REDPINE WIRELESS DRIVER
+M:     Amitkumar Karwar <amitkarwar@gmail.com>
+M:     Siva Rebbagondla <siva8118@gmail.com>
+L:     linux-wireless@vger.kernel.org
+S:     Maintained
+F:     drivers/net/wireless/rsi/
+
 REGISTER MAP ABSTRACTION
 M:     Mark Brown <broonie@kernel.org>
 L:     linux-kernel@vger.kernel.org
@@ -12956,6 +13111,7 @@ F:      drivers/reset/
 F:     Documentation/devicetree/bindings/reset/
 F:     include/dt-bindings/reset/
 F:     include/linux/reset.h
+F:     include/linux/reset/
 F:     include/linux/reset-controller.h
 
 RESTARTABLE SEQUENCES SUPPORT
@@ -13456,6 +13612,7 @@ F:      kernel/sched/
 F:     include/linux/sched.h
 F:     include/uapi/linux/sched.h
 F:     include/linux/wait.h
+F:     include/linux/preempt.h
 
 SCR24X CHIP CARD INTERFACE DRIVER
 M:     Lubomir Rintel <lkundrak@v3.sk>
@@ -13584,11 +13741,18 @@ F:    drivers/mmc/host/sdhci-brcmstb*
 SECURE DIGITAL HOST CONTROLLER INTERFACE (SDHCI) DRIVER
 M:     Adrian Hunter <adrian.hunter@intel.com>
 L:     linux-mmc@vger.kernel.org
-T:     git git://git.infradead.org/users/ahunter/linux-sdhci.git
 S:     Maintained
 F:     drivers/mmc/host/sdhci*
 F:     include/linux/mmc/sdhci*
 
+EMMC CMDQ HOST CONTROLLER INTERFACE (CQHCI) DRIVER
+M:     Adrian Hunter <adrian.hunter@intel.com>
+M:     Ritesh Harjani <riteshh@codeaurora.org>
+M:     Asutosh Das <asutoshd@codeaurora.org>
+L:     linux-mmc@vger.kernel.org
+S:     Maintained
+F:     drivers/mmc/host/cqhci*
+
 SYNOPSYS SDHCI COMPLIANT DWC MSHC DRIVER
 M:     Prabu Thangamuthu <prabu.t@synopsys.com>
 M:     Manjunath M B <manjumb@synopsys.com>
@@ -13694,6 +13858,15 @@ L:     netdev@vger.kernel.org
 S:     Supported
 F:     drivers/net/ethernet/sfc/
 
+SFF/SFP/SFP+ MODULE SUPPORT
+M:     Russell King <linux@armlinux.org.uk>
+L:     netdev@vger.kernel.org
+S:     Maintained
+F:     drivers/net/phy/phylink.c
+F:     drivers/net/phy/sfp*
+F:     include/linux/phylink.h
+F:     include/linux/sfp.h
+
 SGI GRU DRIVER
 M:     Dimitri Sivanich <sivanich@sgi.com>
 S:     Maintained
@@ -13715,6 +13888,7 @@ F:      drivers/misc/sgi-xp/
 
 SHARED MEMORY COMMUNICATIONS (SMC) SOCKETS
 M:     Ursula Braun <ubraun@linux.ibm.com>
+M:     Karsten Graul <kgraul@linux.ibm.com>
 L:     linux-s390@vger.kernel.org
 W:     http://www.ibm.com/developerworks/linux/linux390/
 S:     Supported
@@ -14306,6 +14480,7 @@ F:      arch/arm/mach-spear/
 
 SPI NOR SUBSYSTEM
 M:     Marek Vasut <marek.vasut@gmail.com>
+M:     Tudor Ambarus <tudor.ambarus@microchip.com>
 L:     linux-mtd@lists.infradead.org
 W:     http://www.linux-mtd.infradead.org/
 Q:     http://patchwork.ozlabs.org/project/linux-mtd/list/
@@ -14470,11 +14645,6 @@ L:     linux-wireless@vger.kernel.org
 S:     Supported
 F:     drivers/staging/wilc1000/
 
-STAGING - XGI Z7,Z9,Z11 PCI DISPLAY DRIVER
-M:     Arnaud Patard <arnaud.patard@rtp-net.org>
-S:     Odd Fixes
-F:     drivers/staging/xgifb/
-
 STAGING SUBSYSTEM
 M:     Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git
@@ -14679,7 +14849,7 @@ S:      Maintained
 F:     drivers/tty/serial/8250/8250_dw.c
 
 SYNOPSYS DESIGNWARE APB GPIO DRIVER
-M:     Hoan Tran <hotran@apm.com>
+M:     Hoan Tran <hoan@os.amperecomputing.com>
 L:     linux-gpio@vger.kernel.org
 S:     Maintained
 F:     drivers/gpio/gpio-dwapb.c
@@ -15069,6 +15239,13 @@ L:     alsa-devel@alsa-project.org (moderated for non-subscribers)
 S:     Maintained
 F:     sound/soc/ti/
 
+Texas Instruments' DAC7612 DAC Driver
+M:     Ricardo Ribalda <ricardo@ribalda.com>
+L:     linux-iio@vger.kernel.org
+S:     Supported
+F:     drivers/iio/dac/ti-dac7612.c
+F:     Documentation/devicetree/bindings/iio/dac/ti,dac7612.txt
+
 THANKO'S RAREMONO AM/FM/SW RADIO RECEIVER USB DRIVER
 M:     Hans Verkuil <hverkuil@xs4all.nl>
 L:     linux-media@vger.kernel.org
@@ -15840,6 +16017,7 @@ F:      drivers/usb/common/usb-otg-fsm.c
 USB OVER IP DRIVER
 M:     Valentina Manea <valentina.manea.m@gmail.com>
 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
@@ -16637,6 +16815,15 @@ S:     Maintained
 F:     drivers/platform/x86/
 F:     drivers/platform/olpc/
 
+X86 PLATFORM DRIVERS - ARCH
+R:     Darren Hart <dvhart@infradead.org>
+R:     Andy Shevchenko <andy@infradead.org>
+L:     platform-driver-x86@vger.kernel.org
+L:     x86@kernel.org
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git x86/core
+S:     Maintained
+F:     arch/x86/platform
+
 X86 VDSO
 M:     Andy Lutomirski <luto@kernel.org>
 L:     linux-kernel@vger.kernel.org
@@ -16669,10 +16856,30 @@ T:    git git://linuxtv.org/media_tree.git
 S:     Maintained
 F:     drivers/media/tuners/tuner-xc2028.*
 
+XDP (eXpress Data Path)
+M:     Alexei Starovoitov <ast@kernel.org>
+M:     Daniel Borkmann <daniel@iogearbox.net>
+M:     David S. Miller <davem@davemloft.net>
+M:     Jakub Kicinski <jakub.kicinski@netronome.com>
+M:     Jesper Dangaard Brouer <hawk@kernel.org>
+M:     John Fastabend <john.fastabend@gmail.com>
+L:     netdev@vger.kernel.org
+L:     xdp-newbies@vger.kernel.org
+L:     bpf@vger.kernel.org
+S:     Supported
+F:     net/core/xdp.c
+F:     include/net/xdp.h
+F:     kernel/bpf/devmap.c
+F:     kernel/bpf/cpumap.c
+F:     include/trace/events/xdp.h
+K:     xdp
+N:     xdp
+
 XDP SOCKETS (AF_XDP)
 M:     Björn Töpel <bjorn.topel@intel.com>
 M:     Magnus Karlsson <magnus.karlsson@intel.com>
 L:     netdev@vger.kernel.org
+L:     bpf@vger.kernel.org
 S:     Maintained
 F:     kernel/bpf/xskmap.c
 F:     net/xdp/