drm/amdgpu/powerplay: add support for BACO on Fiji
[linux-2.6-block.git] / MAINTAINERS
index ce0687771073189c2af9145b568f8d623ff2959b..c2d975da561f7f301118068bbb19f8f5f476da89 100644 (file)
@@ -829,17 +829,11 @@ F:        drivers/iommu/amd_iommu*.[ch]
 F:     include/linux/amd-iommu.h
 
 AMD KFD
-M:     Oded Gabbay <oded.gabbay@gmail.com>
-L:     dri-devel@lists.freedesktop.org
-T:     git git://people.freedesktop.org/~gabbayo/linux.git
-S:     Supported
-F:     drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c
-F:     drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h
-F:     drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v7.c
-F:     drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v8.c
-F:     drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c
-F:     drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_fence.c
-F:     drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c
+M:     Felix Kuehling <Felix.Kuehling@amd.com>
+L:     amd-gfx@lists.freedesktop.org
+T:     git git://people.freedesktop.org/~agd5f/linux
+S:     Supported
+F:     drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd*.[ch]
 F:     drivers/gpu/drm/amd/amdkfd/
 F:     drivers/gpu/drm/amd/include/cik_structs.h
 F:     drivers/gpu/drm/amd/include/kgd_kfd_interface.h
@@ -899,7 +893,7 @@ L:  linux-iio@vger.kernel.org
 W:     http://ez.analog.com/community/linux-device-drivers
 S:     Supported
 F:     drivers/iio/adc/ad7124.c
-F:     Documentation/devicetree/bindings/iio/adc/adi,ad7124.txt
+F:     Documentation/devicetree/bindings/iio/adc/adi,ad7124.yaml
 
 ANALOG DEVICES INC AD7606 DRIVER
 M:     Stefan Popa <stefan.popa@analog.com>
@@ -1194,7 +1188,7 @@ F:        include/uapi/linux/if_arcnet.h
 
 ARM ARCHITECTED TIMER DRIVER
 M:     Mark Rutland <mark.rutland@arm.com>
-M:     Marc Zyngier <marc.zyngier@arm.com>
+M:     Marc Zyngier <maz@kernel.org>
 L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:     Maintained
 F:     arch/arm/include/asm/arch_timer.h
@@ -1236,7 +1230,7 @@ M:        James (Qian) Wang <james.qian.wang@arm.com>
 M:     Liviu Dudau <liviu.dudau@arm.com>
 L:     Mali DP Maintainers <malidp@foss.arm.com>
 S:     Supported
-T:     git git://linux-arm.org/linux-ld.git for-upstream/mali-dp
+T:     git git://anongit.freedesktop.org/drm/drm-misc
 F:     drivers/gpu/drm/arm/display/include/
 F:     drivers/gpu/drm/arm/display/komeda/
 F:     Documentation/devicetree/bindings/display/arm,komeda.txt
@@ -1247,7 +1241,7 @@ M:        Liviu Dudau <liviu.dudau@arm.com>
 M:     Brian Starkey <brian.starkey@arm.com>
 L:     Mali DP Maintainers <malidp@foss.arm.com>
 S:     Supported
-T:     git git://linux-arm.org/linux-ld.git for-upstream/mali-dp
+T:     git git://anongit.freedesktop.org/drm/drm-misc
 F:     drivers/gpu/drm/arm/
 F:     Documentation/devicetree/bindings/display/arm,malidp.txt
 F:     Documentation/gpu/afbc.rst
@@ -1264,7 +1258,7 @@ F:        include/uapi/drm/panfrost_drm.h
 ARM MFM AND FLOPPY DRIVERS
 M:     Ian Molton <spyro@f2s.com>
 S:     Maintained
-F:     arch/arm/lib/floppydma.S
+F:     arch/arm/mach-rpc/floppydma.S
 F:     arch/arm/include/asm/floppy.h
 
 ARM PMU PROFILING AND DEBUGGING
@@ -1863,6 +1857,7 @@ F:        arch/arm/mach-orion5x/
 F:     arch/arm/plat-orion/
 F:     arch/arm/boot/dts/dove*
 F:     arch/arm/boot/dts/orion5x*
+T:     git git://git.infradead.org/linux-mvebu.git
 
 ARM/Marvell Kirkwood and Armada 370, 375, 38x, 39x, XP, 3700, 7K/8K SOC support
 M:     Jason Cooper <jason@lakedaemon.net>
@@ -1883,6 +1878,7 @@ F:        drivers/irqchip/irq-armada-370-xp.c
 F:     drivers/irqchip/irq-mvebu-*
 F:     drivers/pinctrl/mvebu/
 F:     drivers/rtc/rtc-armada38x.c
+T:     git git://git.infradead.org/linux-mvebu.git
 
 ARM/Mediatek RTC DRIVER
 M:     Eddie Huang <eddie.huang@mediatek.com>
@@ -2089,7 +2085,6 @@ S:        Maintained
 
 ARM/QUALCOMM SUPPORT
 M:     Andy Gross <agross@kernel.org>
-M:     David Brown <david.brown@linaro.org>
 L:     linux-arm-msm@vger.kernel.org
 S:     Maintained
 F:     Documentation/devicetree/bindings/soc/qcom/
@@ -2111,7 +2106,7 @@ F:        drivers/i2c/busses/i2c-qup.c
 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/mmc/host/sdhci-msm.c
 F:     drivers/pci/controller/dwc/pcie-qcom.c
 F:     drivers/phy/qualcomm/
 F:     drivers/power/*/msm*
@@ -2154,10 +2149,12 @@ F:      Documentation/devicetree/bindings/arm/realtek.txt
 
 ARM/RENESAS ARM64 ARCHITECTURE
 M:     Simon Horman <horms@verge.net.au>
+M:     Geert Uytterhoeven <geert+renesas@glider.be>
 M:     Magnus Damm <magnus.damm@gmail.com>
 L:     linux-renesas-soc@vger.kernel.org
 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
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel.git next
 S:     Supported
 F:     arch/arm64/boot/dts/renesas/
 F:     Documentation/devicetree/bindings/arm/renesas.yaml
@@ -2268,10 +2265,12 @@ F:      drivers/media/platform/s5p-mfc/
 
 ARM/SHMOBILE ARM ARCHITECTURE
 M:     Simon Horman <horms@verge.net.au>
+M:     Geert Uytterhoeven <geert+renesas@glider.be>
 M:     Magnus Damm <magnus.damm@gmail.com>
 L:     linux-renesas-soc@vger.kernel.org
 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
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel.git next
 S:     Supported
 F:     arch/arm/boot/dts/emev2*
 F:     arch/arm/boot/dts/gr-peach*
@@ -3108,9 +3107,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
@@ -3765,7 +3764,7 @@ F:        arch/powerpc/platforms/cell/
 
 CEPH COMMON CODE (LIBCEPH)
 M:     Ilya Dryomov <idryomov@gmail.com>
-M:     "Yan, Zheng" <zyan@redhat.com>
+M:     Jeff Layton <jlayton@kernel.org>
 M:     Sage Weil <sage@redhat.com>
 L:     ceph-devel@vger.kernel.org
 W:     http://ceph.com/
@@ -3777,7 +3776,7 @@ F:        include/linux/ceph/
 F:     include/linux/crush/
 
 CEPH DISTRIBUTED FILE SYSTEM CLIENT (CEPH)
-M:     "Yan, Zheng" <zyan@redhat.com>
+M:     Jeff Layton <jlayton@kernel.org>
 M:     Sage Weil <sage@redhat.com>
 M:     Ilya Dryomov <idryomov@gmail.com>
 L:     ceph-devel@vger.kernel.org
@@ -4189,7 +4188,7 @@ M:        Jens Axboe <axboe@kernel.dk>
 L:     cgroups@vger.kernel.org
 L:     linux-block@vger.kernel.org
 T:     git git://git.kernel.dk/linux-block
-F:     Documentation/cgroup-v1/blkio-controller.rst
+F:     Documentation/admin-guide/cgroup-v1/blkio-controller.rst
 F:     block/blk-cgroup.c
 F:     include/linux/blk-cgroup.h
 F:     block/blk-throttle.c
@@ -4468,7 +4467,7 @@ F:        arch/powerpc/platforms/powernv/pci-cxl.c
 F:     drivers/misc/cxl/
 F:     include/misc/cxl*
 F:     include/uapi/misc/cxl.h
-F:     Documentation/powerpc/cxl.txt
+F:     Documentation/powerpc/cxl.rst
 F:     Documentation/ABI/testing/sysfs-class-cxl
 
 CXLFLASH (IBM Coherent Accelerator Processor Interface CAPI Flash) SCSI DRIVER
@@ -4479,7 +4478,7 @@ L:        linux-scsi@vger.kernel.org
 S:     Supported
 F:     drivers/scsi/cxlflash/
 F:     include/uapi/scsi/cxlflash_ioctl.h
-F:     Documentation/powerpc/cxlflash.txt
+F:     Documentation/powerpc/cxlflash.rst
 
 CYBERPRO FB DRIVER
 M:     Russell King <linux@armlinux.org.uk>
@@ -5094,17 +5093,24 @@ S:      Maintained
 F:     drivers/gpu/drm/panel/panel-feiyang-fy07024di26a30d.c
 F:     Documentation/devicetree/bindings/display/panel/feiyang,fy07024di26a30d.txt
 
+DRM DRIVER FOR GRAIN MEDIA GM12U320 PROJECTORS
+M:     Hans de Goede <hdegoede@redhat.com>
+T:     git git://anongit.freedesktop.org/drm/drm-misc
+S:     Maintained
+F:     drivers/gpu/drm/tiny/gm12u320.c
+
 DRM DRIVER FOR ILITEK ILI9225 PANELS
 M:     David Lechner <david@lechnology.com>
+T:     git git://anongit.freedesktop.org/drm/drm-misc
 S:     Maintained
-F:     drivers/gpu/drm/tinydrm/ili9225.c
+F:     drivers/gpu/drm/tiny/ili9225.c
 F:     Documentation/devicetree/bindings/display/ilitek,ili9225.txt
 
 DRM DRIVER FOR HX8357D PANELS
 M:     Eric Anholt <eric@anholt.net>
 T:     git git://anongit.freedesktop.org/drm/drm-misc
 S:     Maintained
-F:     drivers/gpu/drm/tinydrm/hx8357d.c
+F:     drivers/gpu/drm/tiny/hx8357d.c
 F:     Documentation/devicetree/bindings/display/himax,hx8357d.txt
 
 DRM DRIVER FOR INTEL I810 VIDEO CARDS
@@ -5124,8 +5130,9 @@ F:        drivers/gpu/drm/mgag200/
 
 DRM DRIVER FOR MI0283QT
 M:     Noralf Trønnes <noralf@tronnes.org>
+T:     git git://anongit.freedesktop.org/drm/drm-misc
 S:     Maintained
-F:     drivers/gpu/drm/tinydrm/mi0283qt.c
+F:     drivers/gpu/drm/tiny/mi0283qt.c
 F:     Documentation/devicetree/bindings/display/multi-inno,mi0283qt.txt
 
 DRM DRIVER FOR MSM ADRENO GPU
@@ -5157,8 +5164,9 @@ F:        Documentation/devicetree/bindings/display/panel/olimex,lcd-olinuxino.txt
 
 DRM DRIVER FOR PERVASIVE DISPLAYS REPAPER PANELS
 M:     Noralf Trønnes <noralf@tronnes.org>
+T:     git git://anongit.freedesktop.org/drm/drm-misc
 S:     Maintained
-F:     drivers/gpu/drm/tinydrm/repaper.c
+F:     drivers/gpu/drm/tiny/repaper.c
 F:     Documentation/devicetree/bindings/display/repaper.txt
 
 DRM DRIVER FOR QEMU'S CIRRUS DEVICE
@@ -5180,6 +5188,12 @@ S:       Maintained
 F:     drivers/gpu/drm/qxl/
 F:     include/uapi/drm/qxl_drm.h
 
+DRM DRIVER FOR RAYDIUM RM67191 PANELS
+M:     Robert Chiras <robert.chiras@nxp.com>
+S:     Maintained
+F:     drivers/gpu/drm/panel/panel-raydium-rm67191.c
+F:     Documentation/devicetree/bindings/display/panel/raydium,rm67191.txt
+
 DRM DRIVER FOR RAGE 128 VIDEO CARDS
 S:     Orphan / Obsolete
 F:     drivers/gpu/drm/r128/
@@ -5187,6 +5201,7 @@ F:        include/uapi/drm/r128_drm.h
 
 DRM DRIVER FOR ROCKTECH JH057N00900 PANELS
 M:     Guido Günther <agx@sigxcpu.org>
+R:     Purism Kernel Team <kernel@puri.sm>
 S:     Maintained
 F:     drivers/gpu/drm/panel/panel-rocktech-jh057n00900.c
 F:     Documentation/devicetree/bindings/display/panel/rocktech,jh057n00900.txt
@@ -5209,14 +5224,16 @@ F:      Documentation/devicetree/bindings/display/panel/sitronix,st7701.txt
 
 DRM DRIVER FOR SITRONIX ST7586 PANELS
 M:     David Lechner <david@lechnology.com>
+T:     git git://anongit.freedesktop.org/drm/drm-misc
 S:     Maintained
-F:     drivers/gpu/drm/tinydrm/st7586.c
+F:     drivers/gpu/drm/tiny/st7586.c
 F:     Documentation/devicetree/bindings/display/sitronix,st7586.txt
 
 DRM DRIVER FOR SITRONIX ST7735R PANELS
 M:     David Lechner <david@lechnology.com>
+T:     git git://anongit.freedesktop.org/drm/drm-misc
 S:     Maintained
-F:     drivers/gpu/drm/tinydrm/st7735r.c
+F:     drivers/gpu/drm/tiny/st7735r.c
 F:     Documentation/devicetree/bindings/display/sitronix,st7735r.txt
 
 DRM DRIVER FOR ST-ERICSSON MCDE
@@ -5235,7 +5252,7 @@ M:        Linus Walleij <linus.walleij@linaro.org>
 T:     git git://anongit.freedesktop.org/drm/drm-misc
 S:     Maintained
 F:     drivers/gpu/drm/panel/panel-tpo-tpg110.c
-F:     Documentation/devicetree/bindings/display/panel/tpo,tpg110.txt
+F:     Documentation/devicetree/bindings/display/panel/tpo,tpg110.yaml
 
 DRM DRIVER FOR USB DISPLAYLINK VIDEO ADAPTERS
 M:     Dave Airlie <airlied@redhat.com>
@@ -5317,12 +5334,13 @@ L:      linux-amlogic@lists.infradead.org
 W:     http://linux-meson.com/
 S:     Supported
 F:     drivers/gpu/drm/meson/
-F:     Documentation/devicetree/bindings/display/amlogic,meson-vpu.txt
-F:     Documentation/devicetree/bindings/display/amlogic,meson-dw-hdmi.txt
+F:     Documentation/devicetree/bindings/display/amlogic,meson-vpu.yaml
+F:     Documentation/devicetree/bindings/display/amlogic,meson-dw-hdmi.yaml
 F:     Documentation/gpu/meson.rst
 T:     git git://anongit.freedesktop.org/drm/drm-misc
 
 DRM DRIVERS FOR ATMEL HLCDC
+M:     Sam Ravnborg <sam@ravnborg.org>
 M:     Boris Brezillon <bbrezillon@kernel.org>
 L:     dri-devel@lists.freedesktop.org
 S:     Supported
@@ -5332,7 +5350,10 @@ T:       git git://anongit.freedesktop.org/drm/drm-misc
 
 DRM DRIVERS FOR BRIDGE CHIPS
 M:     Andrzej Hajda <a.hajda@samsung.com>
+M:     Neil Armstrong <narmstrong@baylibre.com>
 R:     Laurent Pinchart <Laurent.pinchart@ideasonboard.com>
+R:     Jonas Karlman <jonas@kwiboo.se>
+R:     Jernej Skrabec <jernej.skrabec@siol.net>
 S:     Maintained
 T:     git git://anongit.freedesktop.org/drm/drm-misc
 F:     drivers/gpu/drm/bridge/
@@ -5520,14 +5541,6 @@ F:       drivers/gpu/drm/panel/
 F:     include/drm/drm_panel.h
 F:     Documentation/devicetree/bindings/display/panel/
 
-DRM TINYDRM DRIVERS
-M:     Noralf Trønnes <noralf@tronnes.org>
-W:     https://github.com/notro/tinydrm/wiki/Development
-T:     git git://anongit.freedesktop.org/drm/drm-misc
-S:     Maintained
-F:     drivers/gpu/drm/tinydrm/
-F:     include/drm/tinydrm/
-
 DRM DRIVERS FOR XEN
 M:     Oleksandr Andrushchenko <oleksandr_andrushchenko@epam.com>
 T:     git git://anongit.freedesktop.org/drm/drm-misc
@@ -6321,9 +6334,9 @@ 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
-S:     Odd fixes
+M:     Denis Efremov <efremov@linux.com>
+S:     Odd Fixes
+L:     linux-block@vger.kernel.org
 F:     drivers/block/floppy.c
 
 FMC SUBSYSTEM
@@ -6526,6 +6539,7 @@ M:        Li Yang <leoyang.li@nxp.com>
 L:     linuxppc-dev@lists.ozlabs.org
 L:     linux-arm-kernel@lists.infradead.org
 S:     Maintained
+F:     Documentation/devicetree/bindings/misc/fsl,dpaa2-console.txt
 F:     Documentation/devicetree/bindings/soc/fsl/
 F:     drivers/soc/fsl/
 F:     include/linux/fsl/
@@ -6855,7 +6869,7 @@ 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:     Documentation/networking/device_drivers/google/gve.rst
 F:     drivers/net/ethernet/google
 
 GPD POCKET FAN DRIVER
@@ -8416,6 +8430,7 @@ L:        linux-fsdevel@vger.kernel.org
 T:     git git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git
 S:     Supported
 F:     fs/iomap.c
+F:     fs/iomap/
 F:     include/linux/iomap.h
 
 IOMMU DRIVERS
@@ -8488,7 +8503,7 @@ S:        Obsolete
 F:     include/uapi/linux/ipx.h
 
 IRQ DOMAINS (IRQ NUMBER MAPPING LIBRARY)
-M:     Marc Zyngier <marc.zyngier@arm.com>
+M:     Marc Zyngier <maz@kernel.org>
 S:     Maintained
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git irq/core
 F:     Documentation/IRQ-domain.txt
@@ -8506,7 +8521,7 @@ F:        kernel/irq/
 IRQCHIP DRIVERS
 M:     Thomas Gleixner <tglx@linutronix.de>
 M:     Jason Cooper <jason@lakedaemon.net>
-M:     Marc Zyngier <marc.zyngier@arm.com>
+M:     Marc Zyngier <maz@kernel.org>
 L:     linux-kernel@vger.kernel.org
 S:     Maintained
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git irq/core
@@ -8806,7 +8821,7 @@ L:        kvm@vger.kernel.org
 W:     http://www.linux-kvm.org
 T:     git git://git.kernel.org/pub/scm/virt/kvm/kvm.git
 S:     Supported
-F:     Documentation/virtual/kvm/
+F:     Documentation/virt/kvm/
 F:     include/trace/events/kvm.h
 F:     include/uapi/asm-generic/kvm*
 F:     include/uapi/linux/kvm*
@@ -8826,10 +8841,10 @@ F:      arch/x86/include/asm/svm.h
 F:     arch/x86/kvm/svm.c
 
 KERNEL VIRTUAL MACHINE FOR ARM/ARM64 (KVM/arm, KVM/arm64)
-M:     Marc Zyngier <marc.zyngier@arm.com>
+M:     Marc Zyngier <maz@kernel.org>
 R:     James Morse <james.morse@arm.com>
-R:     Julien Thierry <julien.thierry@arm.com>
-R:     Suzuki K Pouloze <suzuki.poulose@arm.com>
+R:     Julien Thierry <julien.thierry.kdev@gmail.com>
+R:     Suzuki K Poulose <suzuki.poulose@arm.com>
 L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 L:     kvmarm@lists.cs.columbia.edu
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm.git
@@ -8876,6 +8891,8 @@ F:        arch/s390/include/asm/gmap.h
 F:     arch/s390/include/asm/kvm*
 F:     arch/s390/kvm/
 F:     arch/s390/mm/gmap.c
+F:     tools/testing/selftests/kvm/s390x/
+F:     tools/testing/selftests/kvm/*/s390x/
 
 KERNEL VIRTUAL MACHINE FOR X86 (KVM/x86)
 M:     Paolo Bonzini <pbonzini@redhat.com>
@@ -11905,11 +11922,13 @@ F:    include/linux/mtd/onenand*.h
 
 OP-TEE DRIVER
 M:     Jens Wiklander <jens.wiklander@linaro.org>
+L:     tee-dev@lists.linaro.org
 S:     Maintained
 F:     drivers/tee/optee/
 
 OP-TEE RANDOM NUMBER GENERATOR (RNG) DRIVER
 M:     Sumit Garg <sumit.garg@linaro.org>
+L:     tee-dev@lists.linaro.org
 S:     Maintained
 F:     drivers/char/hw_random/optee-rng.c
 
@@ -12127,10 +12146,11 @@ F:    Documentation/driver-api/parport*.rst
 
 PARAVIRT_OPS INTERFACE
 M:     Juergen Gross <jgross@suse.com>
-M:     Alok Kataria <akataria@vmware.com>
+M:     Thomas Hellstrom <thellstrom@vmware.com>
+M:     "VMware, Inc." <pv-drivers@vmware.com>
 L:     virtualization@lists.linux-foundation.org
 S:     Supported
-F:     Documentation/virtual/paravirt_ops.txt
+F:     Documentation/virt/paravirt_ops.rst
 F:     arch/*/kernel/paravirt*
 F:     arch/*/include/asm/paravirt*.h
 F:     include/linux/hypervisor.h
@@ -12387,7 +12407,7 @@ F:      Documentation/PCI/pci-error-recovery.rst
 F:     drivers/pci/pcie/aer.c
 F:     drivers/pci/pcie/dpc.c
 F:     drivers/pci/pcie/err.c
-F:     Documentation/powerpc/eeh-pci-error-recovery.txt
+F:     Documentation/powerpc/eeh-pci-error-recovery.rst
 F:     arch/powerpc/kernel/eeh*.c
 F:     arch/powerpc/platforms/*/eeh*.c
 F:     arch/powerpc/include/*/eeh*.h
@@ -12841,6 +12861,7 @@ F:      drivers/base/power/
 F:     include/linux/pm.h
 F:     include/linux/pm_*
 F:     include/linux/powercap.h
+F:     include/linux/intel_rapl.h
 F:     drivers/powercap/
 F:     kernel/configs/nopm.config
 
@@ -13292,7 +13313,7 @@ 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
+F:     Documentation/devicetree/bindings/net/qcom,ethqos.txt
 
 QUALCOMM GENERIC INTERFACE I2C DRIVER
 M:     Alok Chauhan <alokc@codeaurora.org>
@@ -13717,10 +13738,11 @@ F:    drivers/mtd/nand/raw/r852.c
 F:     drivers/mtd/nand/raw/r852.h
 
 RISC-V ARCHITECTURE
+M:     Paul Walmsley <paul.walmsley@sifive.com>
 M:     Palmer Dabbelt <palmer@sifive.com>
 M:     Albert Ou <aou@eecs.berkeley.edu>
 L:     linux-riscv@lists.infradead.org
-T:     git git://git.kernel.org/pub/scm/linux/kernel/git/palmer/riscv-linux.git
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git
 S:     Supported
 F:     arch/riscv/
 K:     riscv
@@ -13939,7 +13961,6 @@ F:      drivers/pci/hotplug/s390_pci_hpc.c
 
 S390 VFIO-CCW DRIVER
 M:     Cornelia Huck <cohuck@redhat.com>
-M:     Farhan Ali <alifm@linux.ibm.com>
 M:     Eric Farman <farman@linux.ibm.com>
 R:     Halil Pasic <pasic@linux.ibm.com>
 L:     linux-s390@vger.kernel.org
@@ -14008,6 +14029,12 @@ F:     drivers/media/common/saa7146/
 F:     drivers/media/pci/saa7146/
 F:     include/media/drv-intf/saa7146*
 
+SAFESETID SECURITY MODULE
+M:     Micah Morton <mortonm@chromium.org>
+S:     Supported
+F:     security/safesetid/
+F:     Documentation/admin-guide/LSM/SafeSetID.rst
+
 SAMSUNG AUDIO (ASoC) DRIVERS
 M:     Krzysztof Kozlowski <krzk@kernel.org>
 M:     Sangbeom Kim <sbkim73@samsung.com>
@@ -14582,7 +14609,7 @@ M:      Paul Walmsley <paul.walmsley@sifive.com>
 L:     linux-riscv@lists.infradead.org
 T:     git git://github.com/sifive/riscv-linux.git
 S:     Supported
-K:     sifive
+K:     [^@]sifive
 N:     sifive
 
 SIFIVE FU540 SYSTEM-ON-CHIP
@@ -14873,6 +14900,7 @@ 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
@@ -15741,6 +15769,7 @@ F:      include/media/i2c/tw9910.h
 
 TEE SUBSYSTEM
 M:     Jens Wiklander <jens.wiklander@linaro.org>
+L:     tee-dev@lists.linaro.org
 S:     Maintained
 F:     include/linux/tee_drv.h
 F:     include/uapi/linux/tee.h
@@ -16844,7 +16873,7 @@ W:      http://user-mode-linux.sourceforge.net
 Q:     https://patchwork.ozlabs.org/project/linux-um/list/
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml.git
 S:     Maintained
-F:     Documentation/virtual/uml/
+F:     Documentation/virt/uml/
 F:     arch/um/
 F:     arch/x86/um/
 F:     fs/hostfs/
@@ -17113,7 +17142,7 @@ F:      drivers/virtio/virtio_input.c
 F:     include/uapi/linux/virtio_input.h
 
 VIRTIO IOMMU DRIVER
-M:     Jean-Philippe Brucker <jean-philippe.brucker@arm.com>
+M:     Jean-Philippe Brucker <jean-philippe@linaro.org>
 L:     virtualization@lists.linux-foundation.org
 S:     Maintained
 F:     drivers/iommu/virtio-iommu.c
@@ -17162,7 +17191,6 @@ F:      drivers/vme/
 F:     include/linux/vme*
 
 VMWARE BALLOON DRIVER
-M:     Julien Freche <jfreche@vmware.com>
 M:     Nadav Amit <namit@vmware.com>
 M:     "VMware, Inc." <pv-drivers@vmware.com>
 L:     linux-kernel@vger.kernel.org
@@ -17170,7 +17198,8 @@ S:      Maintained
 F:     drivers/misc/vmw_balloon.c
 
 VMWARE HYPERVISOR INTERFACE
-M:     Alok Kataria <akataria@vmware.com>
+M:     Thomas Hellstrom <thellstrom@vmware.com>
+M:     "VMware, Inc." <pv-drivers@vmware.com>
 L:     virtualization@lists.linux-foundation.org
 S:     Supported
 F:     arch/x86/kernel/cpu/vmware.c
@@ -17651,9 +17680,8 @@ L:      linux-xfs@vger.kernel.org
 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/admin-guide/xfs.rst
 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/