docs: packing: move it to core-api book and adjust markups

[linux.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 64f659d8346cceb3d1bb236614712defbe100fac..11525de0bd160e0326b9dadc84fcabf0b00e2286 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -666,7 +666,7 @@ ALI1563 I2C DRIVER
 M:     Rudolf Marek <r.marek@assembler.cz>
 L:     linux-i2c@vger.kernel.org
 S:     Maintained
-F:     Documentation/i2c/busses/i2c-ali1563
+F:     Documentation/i2c/busses/i2c-ali1563.rst
 F:     drivers/i2c/busses/i2c-ali1563.c
 
 ALLEGRO DVT VIDEO IP CORE DRIVER
@@ -899,7 +899,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>
@@ -1155,7 +1155,7 @@ APPLIED MICRO (APM) X-GENE SOC PMU
 M:     Khuong Dinh <khuong@os.amperecomputing.com>
 S:     Supported
 F:     drivers/perf/xgene_pmu.c
-F:     Documentation/perf/xgene-pmu.txt
+F:     Documentation/admin-guide/perf/xgene-pmu.rst
 F:     Documentation/devicetree/bindings/perf/apm-xgene-pmu.txt
 
 APTINA CAMERA SENSOR PLL
@@ -1236,7 +1236,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 +1247,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 +1264,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
@@ -1582,8 +1582,8 @@ R:        Suzuki K Poulose <suzuki.poulose@arm.com>
 L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:     Maintained
 F:     drivers/hwtracing/coresight/*
-F:     Documentation/trace/coresight.txt
-F:     Documentation/trace/coresight-cpu-debug.txt
+F:     Documentation/trace/coresight.rst
+F:     Documentation/trace/coresight-cpu-debug.rst
 F:     Documentation/devicetree/bindings/arm/coresight.txt
 F:     Documentation/devicetree/bindings/arm/coresight-cpu-debug.txt
 F:     Documentation/ABI/testing/sysfs-bus-coresight-devices-*
@@ -1863,6 +1863,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 +1884,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 +2091,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 +2112,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*
@@ -2218,7 +2219,7 @@ F:        drivers/*/*s3c64xx*
 F:     drivers/*/*s5pv210*
 F:     drivers/memory/samsung/*
 F:     drivers/soc/samsung/*
-F:     Documentation/arm/Samsung/
+F:     Documentation/arm/samsung/
 F:     Documentation/devicetree/bindings/arm/samsung/
 F:     Documentation/devicetree/bindings/sram/samsung-sram.txt
 F:     Documentation/devicetree/bindings/power/pd-samsung.txt
@@ -2689,7 +2690,7 @@ ATA OVER ETHERNET (AOE) DRIVER
 M:     "Justin Sanders" <justin@coraid.com>
 W:     http://www.openaoe.org/
 S:     Supported
-F:     Documentation/aoe/
+F:     Documentation/admin-guide/aoe/
 F:     drivers/block/aoe/
 
 ATHEROS 71XX/9XXX GPIO DRIVER
@@ -2968,7 +2969,7 @@ M:        Jens Axboe <axboe@kernel.dk>
 L:     linux-block@vger.kernel.org
 S:     Maintained
 F:     block/bfq-*
-F:     Documentation/block/bfq-iosched.txt
+F:     Documentation/block/bfq-iosched.rst
 
 BFS FILE SYSTEM
 M:     "Tigran A. Aivazian" <aivazian.tigran@gmail.com>
@@ -3108,9 +3109,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 +3766,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 +3778,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
@@ -4158,7 +4159,7 @@ L:        cgroups@vger.kernel.org
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git
 S:     Maintained
 F:     Documentation/admin-guide/cgroup-v2.rst
-F:     Documentation/cgroup-v1/
+F:     Documentation/admin-guide/cgroup-v1/
 F:     include/linux/cgroup*
 F:     kernel/cgroup/
 
@@ -4169,7 +4170,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.rst
+F:     Documentation/admin-guide/cgroup-v1/cpusets.rst
 F:     include/linux/cpuset.h
 F:     kernel/cgroup/cpuset.c
 
@@ -4183,6 +4184,19 @@ S:       Maintained
 F:     mm/memcontrol.c
 F:     mm/swap_cgroup.c
 
+CONTROL GROUP - BLOCK IO CONTROLLER (BLKIO)
+M:     Tejun Heo <tj@kernel.org>
+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/admin-guide/cgroup-v1/blkio-controller.rst
+F:     block/blk-cgroup.c
+F:     include/linux/blk-cgroup.h
+F:     block/blk-throttle.c
+F:     block/blk-iolatency.c
+F:     block/bfq-cgroup.c
+
 CORETEMP HARDWARE MONITORING DRIVER
 M:     Fenghua Yu <fenghua.yu@intel.com>
 L:     linux-hwmon@vger.kernel.org
@@ -4455,7 +4469,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
@@ -4466,7 +4480,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>
@@ -4642,7 +4656,7 @@ DELL SYSTEMS MANAGEMENT BASE DRIVER (dcdbas)
 M:     Stuart Hayes <stuart.w.hayes@gmail.com>
 L:     platform-driver-x86@vger.kernel.org
 S:     Maintained
-F:     Documentation/dcdbas.txt
+F:     Documentation/driver-api/dcdbas.rst
 F:     drivers/platform/x86/dcdbas.*
 
 DELL WMI NOTIFICATIONS DRIVER
@@ -4670,6 +4684,13 @@ L:       linux-mtd@lists.infradead.org
 S:     Supported
 F:     drivers/mtd/nand/raw/denali*
 
+DESIGNWARE EDMA CORE IP DRIVER
+M:     Gustavo Pimentel <gustavo.pimentel@synopsys.com>
+L:     dmaengine@vger.kernel.org
+S:     Maintained
+F:     drivers/dma/dw-edma/
+F:     include/linux/dma/edma.h
+
 DESIGNWARE USB2 DRD IP DRIVER
 M:     Minas Harutyunyan <hminas@synopsys.com>
 L:     linux-usb@vger.kernel.org
@@ -4735,7 +4756,7 @@ Q:        http://patchwork.kernel.org/project/dm-devel/list/
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm.git
 T:     quilt http://people.redhat.com/agk/patches/linux/editing/
 S:     Maintained
-F:     Documentation/device-mapper/
+F:     Documentation/admin-guide/device-mapper/
 F:     drivers/md/Makefile
 F:     drivers/md/Kconfig
 F:     drivers/md/dm*
@@ -4926,7 +4947,9 @@ M:        Jonathan Corbet <corbet@lwn.net>
 L:     linux-doc@vger.kernel.org
 S:     Maintained
 F:     Documentation/
+F:     scripts/documentation-file-ref-check
 F:     scripts/kernel-doc
+F:     scripts/sphinx-pre-install
 X:     Documentation/ABI/
 X:     Documentation/firmware-guide/acpi/
 X:     Documentation/devicetree/
@@ -4942,6 +4965,14 @@ L:       linux-doc@vger.kernel.org
 S:     Maintained
 F:     Documentation/translations/it_IT
 
+DOCUMENTATION SCRIPTS
+M:     Mauro Carvalho Chehab <mchehab@kernel.org>
+L:     linux-doc@vger.kernel.org
+S:     Maintained
+F:     scripts/documentation-file-ref-check
+F:     scripts/sphinx-pre-install
+F:     Documentation/sphinx/parse-headers.pl
+
 DONGWOON DW9714 LENS VOICE COIL DRIVER
 M:     Sakari Ailus <sakari.ailus@linux.intel.com>
 L:     linux-media@vger.kernel.org
@@ -5006,7 +5037,7 @@ T:        git git://git.linbit.com/drbd-8.4.git
 S:     Supported
 F:     drivers/block/drbd/
 F:     lib/lru_cache.c
-F:     Documentation/blockdev/drbd/
+F:     Documentation/admin-guide/blockdev/
 
 DRIVER CORE, KOBJECTS, DEBUGFS AND SYSFS
 M:     Greg Kroah-Hartman <gregkh@linuxfoundation.org>
@@ -5199,6 +5230,13 @@ S:       Maintained
 F:     drivers/gpu/drm/tinydrm/st7735r.c
 F:     Documentation/devicetree/bindings/display/sitronix,st7735r.txt
 
+DRM DRIVER FOR ST-ERICSSON MCDE
+M:     Linus Walleij <linus.walleij@linaro.org>
+T:     git git://anongit.freedesktop.org/drm/drm-misc
+S:     Maintained
+F:     drivers/gpu/drm/mcde/
+F:     Documentation/devicetree/bindings/display/ste,mcde.txt
+
 DRM DRIVER FOR TDFX VIDEO CARDS
 S:     Orphan / Obsolete
 F:     drivers/gpu/drm/tdfx/
@@ -5484,6 +5522,7 @@ T:        git git://anongit.freedesktop.org/drm/drm-misc
 
 DRM PANEL DRIVERS
 M:     Thierry Reding <thierry.reding@gmail.com>
+R:     Sam Ravnborg <sam@ravnborg.org>
 L:     dri-devel@lists.freedesktop.org
 T:     git git://anongit.freedesktop.org/drm/drm-misc
 S:     Maintained
@@ -5512,7 +5551,6 @@ F:        Documentation/gpu/xen-front.rst
 DRM TTM SUBSYSTEM
 M:     Christian Koenig <christian.koenig@amd.com>
 M:     Huang Rui <ray.huang@amd.com>
-M:     Junwei Zhang <Jerry.Zhang@amd.com>
 T:     git git://people.freedesktop.org/~agd5f/linux
 S:     Maintained
 L:     dri-devel@lists.freedesktop.org
@@ -6033,7 +6071,7 @@ M:        Florian Fainelli <f.fainelli@gmail.com>
 M:     Heiner Kallweit <hkallweit1@gmail.com>
 L:     netdev@vger.kernel.org
 S:     Maintained
-F:     Documentation/ABI/testing/sysfs-bus-mdio
+F:     Documentation/ABI/testing/sysfs-class-net-phydev
 F:     Documentation/devicetree/bindings/net/ethernet-phy.yaml
 F:     Documentation/devicetree/bindings/net/mdio*
 F:     Documentation/networking/phy.rst
@@ -6080,7 +6118,7 @@ M:        Ard Biesheuvel <ard.biesheuvel@linaro.org>
 L:     linux-efi@vger.kernel.org
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git
 S:     Maintained
-F:     Documentation/efi-stub.txt
+F:     Documentation/admin-guide/efi-stub.rst
 F:     arch/*/kernel/efi.c
 F:     arch/x86/boot/compressed/eboot.[ch]
 F:     arch/*/include/asm/efi.h
@@ -6289,14 +6327,13 @@ 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/ABI/testing/sysfs-bus-counter-ftm-quaddec
 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
+S:     Orphan
+L:     linux-block@vger.kernel.org
 F:     drivers/block/floppy.c
 
 FMC SUBSYSTEM
@@ -6499,6 +6536,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/
@@ -6541,7 +6579,7 @@ M:        "Rafael J. Wysocki" <rjw@rjwysocki.net>
 M:     Pavel Machek <pavel@ucw.cz>
 L:     linux-pm@vger.kernel.org
 S:     Supported
-F:     Documentation/power/freezing-of-tasks.txt
+F:     Documentation/power/freezing-of-tasks.rst
 F:     include/linux/freezer.h
 F:     kernel/freezer.c
 
@@ -6655,7 +6693,7 @@ S:        Maintained
 F:     scripts/gcc-plugins/
 F:     scripts/gcc-plugin.sh
 F:     scripts/Makefile.gcc-plugins
-F:     Documentation/gcc-plugins.txt
+F:     Documentation/core-api/gcc-plugins.rst
 
 GASKET DRIVER FRAMEWORK
 M:     Rob Springer <rspringer@google.com>
@@ -6703,7 +6741,7 @@ L:        linux-i2c@vger.kernel.org
 S:     Supported
 F:     drivers/i2c/muxes/i2c-mux-gpio.c
 F:     include/linux/platform_data/i2c-mux-gpio.h
-F:     Documentation/i2c/muxes/i2c-mux-gpio
+F:     Documentation/i2c/muxes/i2c-mux-gpio.rst
 
 GENERIC HDLC (WAN) DRIVERS
 M:     Krzysztof Halasa <khc@pm.waw.pl>
@@ -6828,7 +6866,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
@@ -6867,7 +6905,7 @@ T:        git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio.git
 S:     Maintained
 F:     Documentation/devicetree/bindings/gpio/
 F:     Documentation/driver-api/gpio/
-F:     Documentation/gpio/
+F:     Documentation/admin-guide/gpio/
 F:     Documentation/ABI/testing/gpio-cdev
 F:     Documentation/ABI/obsolete/sysfs-gpio
 F:     drivers/gpio/
@@ -7088,7 +7126,7 @@ M:        Herbert Xu <herbert@gondor.apana.org.au>
 L:     linux-crypto@vger.kernel.org
 S:     Odd fixes
 F:     Documentation/devicetree/bindings/rng/
-F:     Documentation/hw_random.txt
+F:     Documentation/admin-guide/hw_random.rst
 F:     drivers/char/hw_random/
 F:     include/linux/hw_random.h
 
@@ -7262,7 +7300,7 @@ M:        Shaokun Zhang <zhangshaokun@hisilicon.com>
 W:     http://www.hisilicon.com
 S:     Supported
 F:     drivers/perf/hisilicon
-F:     Documentation/perf/hisi-pmu.txt
+F:     Documentation/admin-guide/perf/hisi-pmu.rst
 
 HISILICON ROCE DRIVER
 M:     Lijun Ou <oulijun@huawei.com>
@@ -7459,14 +7497,14 @@ I2C CONTROLLER DRIVER FOR NVIDIA GPU
 M:     Ajay Gupta <ajayg@nvidia.com>
 L:     linux-i2c@vger.kernel.org
 S:     Maintained
-F:     Documentation/i2c/busses/i2c-nvidia-gpu
+F:     Documentation/i2c/busses/i2c-nvidia-gpu.rst
 F:     drivers/i2c/busses/i2c-nvidia-gpu.c
 
 I2C MUXES
 M:     Peter Rosin <peda@axentia.se>
 L:     linux-i2c@vger.kernel.org
 S:     Maintained
-F:     Documentation/i2c/i2c-topology
+F:     Documentation/i2c/i2c-topology.rst
 F:     Documentation/i2c/muxes/
 F:     Documentation/devicetree/bindings/i2c/i2c-mux*
 F:     Documentation/devicetree/bindings/i2c/i2c-arb*
@@ -7479,15 +7517,15 @@ I2C MV64XXX MARVELL AND ALLWINNER DRIVER
 M:     Gregory CLEMENT <gregory.clement@bootlin.com>
 L:     linux-i2c@vger.kernel.org
 S:     Maintained
-F:     Documentation/devicetree/bindings/i2c/i2c-mv64xxx.txt
+F:     Documentation/devicetree/bindings/i2c/marvell,mv64xxx-i2c.yaml
 F:     drivers/i2c/busses/i2c-mv64xxx.c
 
 I2C OVER PARALLEL PORT
 M:     Jean Delvare <jdelvare@suse.com>
 L:     linux-i2c@vger.kernel.org
 S:     Maintained
-F:     Documentation/i2c/busses/i2c-parport
-F:     Documentation/i2c/busses/i2c-parport-light
+F:     Documentation/i2c/busses/i2c-parport.rst
+F:     Documentation/i2c/busses/i2c-parport-light.rst
 F:     drivers/i2c/busses/i2c-parport.c
 F:     drivers/i2c/busses/i2c-parport-light.c
 
@@ -7521,7 +7559,7 @@ I2C-TAOS-EVM DRIVER
 M:     Jean Delvare <jdelvare@suse.com>
 L:     linux-i2c@vger.kernel.org
 S:     Maintained
-F:     Documentation/i2c/busses/i2c-taos-evm
+F:     Documentation/i2c/busses/i2c-taos-evm.rst
 F:     drivers/i2c/busses/i2c-taos-evm.c
 
 I2C-TINY-USB DRIVER
@@ -7535,19 +7573,19 @@ I2C/SMBUS CONTROLLER DRIVERS FOR PC
 M:     Jean Delvare <jdelvare@suse.com>
 L:     linux-i2c@vger.kernel.org
 S:     Maintained
-F:     Documentation/i2c/busses/i2c-ali1535
-F:     Documentation/i2c/busses/i2c-ali1563
-F:     Documentation/i2c/busses/i2c-ali15x3
-F:     Documentation/i2c/busses/i2c-amd756
-F:     Documentation/i2c/busses/i2c-amd8111
-F:     Documentation/i2c/busses/i2c-i801
-F:     Documentation/i2c/busses/i2c-nforce2
-F:     Documentation/i2c/busses/i2c-piix4
-F:     Documentation/i2c/busses/i2c-sis5595
-F:     Documentation/i2c/busses/i2c-sis630
-F:     Documentation/i2c/busses/i2c-sis96x
-F:     Documentation/i2c/busses/i2c-via
-F:     Documentation/i2c/busses/i2c-viapro
+F:     Documentation/i2c/busses/i2c-ali1535.rst
+F:     Documentation/i2c/busses/i2c-ali1563.rst
+F:     Documentation/i2c/busses/i2c-ali15x3.rst
+F:     Documentation/i2c/busses/i2c-amd756.rst
+F:     Documentation/i2c/busses/i2c-amd8111.rst
+F:     Documentation/i2c/busses/i2c-i801.rst
+F:     Documentation/i2c/busses/i2c-nforce2.rst
+F:     Documentation/i2c/busses/i2c-piix4.rst
+F:     Documentation/i2c/busses/i2c-sis5595.rst
+F:     Documentation/i2c/busses/i2c-sis630.rst
+F:     Documentation/i2c/busses/i2c-sis96x.rst
+F:     Documentation/i2c/busses/i2c-via.rst
+F:     Documentation/i2c/busses/i2c-viapro.rst
 F:     drivers/i2c/busses/i2c-ali1535.c
 F:     drivers/i2c/busses/i2c-ali1563.c
 F:     drivers/i2c/busses/i2c-ali15x3.c
@@ -7576,7 +7614,7 @@ M:        Seth Heasley <seth.heasley@intel.com>
 M:     Neil Horman <nhorman@tuxdriver.com>
 L:     linux-i2c@vger.kernel.org
 F:     drivers/i2c/busses/i2c-ismt.c
-F:     Documentation/i2c/busses/i2c-ismt
+F:     Documentation/i2c/busses/i2c-ismt.rst
 
 I2C/SMBUS STUB DRIVER
 M:     Jean Delvare <jdelvare@suse.com>
@@ -7935,6 +7973,33 @@ L:       linux-mtd@lists.infradead.org
 S:     Maintained
 F:     drivers/mtd/nand/raw/ingenic/
 
+INGENIC JZ47xx SoCs
+M:     Paul Cercueil <paul@crapouillou.net>
+S:     Maintained
+F:     arch/mips/boot/dts/ingenic/
+F:     arch/mips/include/asm/mach-jz4740/
+F:     arch/mips/jz4740/
+F:     drivers/clk/ingenic/
+F:     drivers/dma/dma-jz4780.c
+F:     drivers/gpu/drm/ingenic/
+F:     drivers/i2c/busses/i2c-jz4780.c
+F:     drivers/iio/adc/ingenic-adc.c
+F:     drivers/irqchip/irq-ingenic.c
+F:     drivers/memory/jz4780-nemc.c
+F:     drivers/mmc/host/jz4740_mmc.c
+F:     drivers/mtd/nand/raw/ingenic/
+F:     drivers/pinctrl/pinctrl-ingenic.c
+F:     drivers/power/supply/ingenic-battery.c
+F:     drivers/pwm/pwm-jz4740.c
+F:     drivers/rtc/rtc-jz4740.c
+F:     drivers/tty/serial/8250/8250_ingenic.c
+F:     drivers/usb/musb/jz4740.c
+F:     drivers/watchdog/jz4740_wdt.c
+F:     include/dt-bindings/iio/adc/ingenic,adc.h
+F:     include/linux/mfd/ingenic-tcu.h
+F:     sound/soc/jz4740/
+F:     sound/soc/codecs/jz47*
+
 INOTIFY
 M:     Jan Kara <jack@suse.cz>
 R:     Amir Goldstein <amir73il@gmail.com>
@@ -8215,7 +8280,7 @@ T:        git git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-gpio-intel.git
 F:     drivers/gpio/gpio-*cove.c
 F:     drivers/gpio/gpio-msic.c
 
-INTEL MULTIFUNCTION PMIC DEVICE DRIVERS
+INTEL PMIC MULTIFUNCTION DEVICE DRIVERS
 R:     Andy Shevchenko <andriy.shevchenko@linux.intel.com>
 S:     Maintained
 F:     drivers/mfd/intel_msic.c
@@ -8246,6 +8311,14 @@ S:       Supported
 F:     drivers/infiniband/hw/i40iw/
 F:     include/uapi/rdma/i40iw-abi.h
 
+INTEL SPEED SELECT TECHNOLOGY
+M:     Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
+L:     platform-driver-x86@vger.kernel.org
+S:     Maintained
+F:     drivers/platform/x86/intel_speed_select_if/
+F:     tools/power/x86/intel-speed-select/
+F:     include/uapi/linux/isst_if.h
+
 INTEL TELEMETRY DRIVER
 M:     Rajneesh Bhardwaj <rajneesh.bhardwaj@linux.intel.com>
 M:     "David E. Box" <david.e.box@linux.intel.com>
@@ -8304,7 +8377,7 @@ L:        tboot-devel@lists.sourceforge.net
 W:     http://tboot.sourceforge.net
 T:     hg http://tboot.hg.sourceforge.net:8000/hgroot/tboot/tboot
 S:     Supported
-F:     Documentation/intel_txt.txt
+F:     Documentation/x86/intel_txt.rst
 F:     include/linux/tboot.h
 F:     arch/x86/kernel/tboot.c
 
@@ -8318,7 +8391,7 @@ INTERCONNECT API
 M:     Georgi Djakov <georgi.djakov@linaro.org>
 L:     linux-pm@vger.kernel.org
 S:     Maintained
-F:     Documentation/interconnect/
+F:     Documentation/driver-api/interconnect.rst
 F:     Documentation/devicetree/bindings/interconnect/
 F:     drivers/interconnect/
 F:     include/dt-bindings/interconnect/
@@ -8354,6 +8427,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
@@ -8454,7 +8528,7 @@ F:        drivers/irqchip/
 ISA
 M:     William Breathitt Gray <vilhelm.gray@gmail.com>
 S:     Maintained
-F:     Documentation/isa.txt
+F:     Documentation/driver-api/isa.rst
 F:     drivers/base/isa.c
 F:     include/linux/isa.h
 
@@ -8469,7 +8543,7 @@ F:        drivers/media/radio/radio-isa*
 ISAPNP
 M:     Jaroslav Kysela <perex@perex.cz>
 S:     Maintained
-F:     Documentation/isapnp.txt
+F:     Documentation/driver-api/isapnp.rst
 F:     drivers/pnp/isapnp/
 F:     include/linux/isapnp.h
 
@@ -8667,7 +8741,7 @@ R:        Vivek Goyal <vgoyal@redhat.com>
 L:     kexec@lists.infradead.org
 W:     http://lse.sourceforge.net/kdump/
 S:     Maintained
-F:     Documentation/kdump/
+F:     Documentation/admin-guide/kdump/
 
 KEENE FM RADIO TRANSMITTER DRIVER
 M:     Hans Verkuil <hverkuil@xs4all.nl>
@@ -8814,6 +8888,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>
@@ -9021,7 +9097,7 @@ M:        Matan Ziv-Av <matan@svgalib.org>
 L:     platform-driver-x86@vger.kernel.org
 S:     Maintained
 F:     Documentation/ABI/testing/sysfs-platform-lg-laptop
-F:     Documentation/laptops/lg-laptop.rst
+F:     Documentation/admin-guide/laptops/lg-laptop.rst
 F:     drivers/platform/x86/lg-laptop.c
 
 LG2160 MEDIA DRIVER
@@ -9390,7 +9466,7 @@ M:        "Richard Russon (FlatCap)" <ldm@flatcap.org>
 L:     linux-ntfs-dev@lists.sourceforge.net
 W:     http://www.linux-ntfs.org/content/view/19/37/
 S:     Maintained
-F:     Documentation/ldm.txt
+F:     Documentation/admin-guide/ldm.rst
 F:     block/partitions/ldm.*
 
 LSILOGIC MPT FUSION DRIVERS (FC/SAS/SPI)
@@ -10108,6 +10184,13 @@ L:     linux-wireless@vger.kernel.org
 S:     Maintained
 F:     drivers/net/wireless/mediatek/mt7601u/
 
+MEDIATEK MT7621/28/88 I2C DRIVER
+M:     Stefan Roese <sr@denx.de>
+L:     linux-i2c@vger.kernel.org
+S:     Maintained
+F:     drivers/i2c/busses/i2c-mt7621.c
+F:     Documentation/devicetree/bindings/i2c/i2c-mt7621.txt
+
 MEDIATEK NAND CONTROLLER DRIVER
 M:     Xiaolei Li <xiaolei.li@mediatek.com>
 L:     linux-mtd@lists.infradead.org
@@ -10272,7 +10355,7 @@ L:      linux-i2c@vger.kernel.org
 S:     Supported
 F:     drivers/i2c/busses/i2c-mlxcpld.c
 F:     drivers/i2c/muxes/i2c-mux-mlxcpld.c
-F:     Documentation/i2c/busses/i2c-mlxcpld
+F:     Documentation/i2c/busses/i2c-mlxcpld.rst
 
 MELLANOX MLXCPLD LED DRIVER
 M:     Vadim Pasternak <vadimp@mellanox.com>
@@ -10345,7 +10428,7 @@ M:      Johannes Thumshirn <morbidrsa@gmail.com>
 S:     Maintained
 F:     drivers/mcb/
 F:     include/linux/mcb.h
-F:     Documentation/men-chameleon-bus.txt
+F:     Documentation/driver-api/men-chameleon-bus.rst
 
 MEN F21BMC (Board Management Controller)
 M:     Andreas Werner <andreas.werner@men.de>
@@ -10759,7 +10842,7 @@ F:      include/uapi/linux/meye.h
 MOXA SMARTIO/INDUSTIO/INTELLIO SERIAL CARD
 M:     Jiri Slaby <jirislaby@gmail.com>
 S:     Maintained
-F:     Documentation/serial/moxa-smartio.rst
+F:     Documentation/driver-api/serial/moxa-smartio.rst
 F:     drivers/tty/mxser.*
 
 MR800 AVERMEDIA USB FM RADIO DRIVER
@@ -11003,14 +11086,6 @@ F:     driver/net/net_failover.c
 F:     include/net/net_failover.h
 F:     Documentation/networking/net_failover.rst
 
-NETEFFECT IWARP RNIC DRIVER (IW_NES)
-M:     Faisal Latif <faisal.latif@intel.com>
-L:     linux-rdma@vger.kernel.org
-W:     http://www.intel.com/Products/Server/Adapters/Server-Cluster/Server-Cluster-overview.htm
-S:     Supported
-F:     drivers/infiniband/hw/nes/
-F:     include/uapi/rdma/nes-abi.h
-
 NETEM NETWORK EMULATOR
 M:     Stephen Hemminger <stephen@networkplumber.org>
 L:     netem@lists.linux-foundation.org (moderated for non-subscribers)
@@ -11068,7 +11143,7 @@ M:      Josef Bacik <josef@toxicpanda.com>
 S:     Maintained
 L:     linux-block@vger.kernel.org
 L:     nbd@other.debian.org
-F:     Documentation/blockdev/nbd.txt
+F:     Documentation/admin-guide/blockdev/nbd.rst
 F:     drivers/block/nbd.c
 F:     include/trace/events/nbd.h
 F:     include/uapi/linux/nbd.h
@@ -11527,7 +11602,7 @@ F:      arch/powerpc/include/asm/pnv-ocxl.h
 F:     drivers/misc/ocxl/
 F:     include/misc/ocxl*
 F:     include/uapi/misc/ocxl.h
-F:     Documentation/accelerators/ocxl.rst
+F:     Documentation/userspace-api/accelerators/ocxl.rst
 
 OMAP AUDIO SUPPORT
 M:     Peter Ujfalusi <peter.ujfalusi@ti.com>
@@ -11563,7 +11638,7 @@ L:      linux-omap@vger.kernel.org
 L:     linux-fbdev@vger.kernel.org
 S:     Orphan
 F:     drivers/video/fbdev/omap2/
-F:     Documentation/arm/OMAP/DSS
+F:     Documentation/arm/omap/dss.rst
 
 OMAP FRAMEBUFFER SUPPORT
 L:     linux-fbdev@vger.kernel.org
@@ -11844,11 +11919,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
 
@@ -11899,7 +11976,7 @@ M:      Andrew Lunn <andrew@lunn.ch>
 L:     linux-i2c@vger.kernel.org
 S:     Maintained
 F:     Documentation/devicetree/bindings/i2c/i2c-ocores.txt
-F:     Documentation/i2c/busses/i2c-ocores
+F:     Documentation/i2c/busses/i2c-ocores.rst
 F:     drivers/i2c/busses/i2c-ocores.c
 F:     include/linux/platform_data/i2c-ocores.h
 
@@ -11935,7 +12012,7 @@ S:      Maintained
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm.git
 F:     drivers/opp/
 F:     include/linux/pm_opp.h
-F:     Documentation/power/opp.txt
+F:     Documentation/power/opp.rst
 F:     Documentation/devicetree/bindings/opp/
 
 OPL4 DRIVER
@@ -12022,7 +12099,7 @@ L:      netdev@vger.kernel.org
 S:     Supported
 F:     lib/packing.c
 F:     include/linux/packing.h
-F:     Documentation/packing.txt
+F:     Documentation/core-api/packing.rst
 
 PADATA PARALLEL EXECUTION MECHANISM
 M:     Steffen Klassert <steffen.klassert@secunet.com>
@@ -12050,7 +12127,7 @@ PARALLEL LCD/KEYPAD PANEL DRIVER
 M:     Willy Tarreau <willy@haproxy.com>
 M:     Ksenija Stanojevic <ksenija.stanojevic@gmail.com>
 S:     Odd Fixes
-F:     Documentation/auxdisplay/lcd-panel-cgram.txt
+F:     Documentation/admin-guide/lcd-panel-cgram.rst
 F:     drivers/auxdisplay/panel.c
 
 PARALLEL PORT SUBSYSTEM
@@ -12062,14 +12139,15 @@ F:    drivers/parport/
 F:     include/linux/parport*.h
 F:     drivers/char/ppdev.c
 F:     include/uapi/linux/ppdev.h
-F:     Documentation/parport*.txt
+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/virtual/paravirt_ops.rst
 F:     arch/*/kernel/paravirt*
 F:     arch/*/include/asm/paravirt*.h
 F:     include/linux/hypervisor.h
@@ -12078,7 +12156,7 @@ PARIDE DRIVERS FOR PARALLEL PORT IDE DEVICES
 M:     Tim Waugh <tim@cyberelk.net>
 L:     linux-parport@lists.infradead.org (subscribers-only)
 S:     Maintained
-F:     Documentation/blockdev/paride.txt
+F:     Documentation/admin-guide/blockdev/paride.rst
 F:     drivers/block/paride/
 
 PARISC ARCHITECTURE
@@ -12237,7 +12315,7 @@ M:      Kurt Schwemmer <kurt.schwemmer@microsemi.com>
 M:     Logan Gunthorpe <logang@deltatee.com>
 L:     linux-pci@vger.kernel.org
 S:     Maintained
-F:     Documentation/switchtec.txt
+F:     Documentation/driver-api/switchtec.rst
 F:     Documentation/ABI/testing/sysfs-class-switchtec
 F:     drivers/pci/switch/switchtec*
 F:     include/uapi/linux/switchtec_ioctl.h
@@ -12322,11 +12400,11 @@ M:    Sam Bobroff <sbobroff@linux.ibm.com>
 M:     Oliver O'Halloran <oohall@gmail.com>
 L:     linuxppc-dev@lists.ozlabs.org
 S:     Supported
-F:     Documentation/PCI/pci-error-recovery.txt
+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
@@ -12335,7 +12413,7 @@ PCI ERROR RECOVERY
 M:     Linas Vepstas <linasvepstas@gmail.com>
 L:     linux-pci@vger.kernel.org
 S:     Supported
-F:     Documentation/PCI/pci-error-recovery.txt
+F:     Documentation/PCI/pci-error-recovery.rst
 
 PCI MSI DRIVER FOR ALTERA MSI IP
 M:     Ley Foon Tan <lftan@altera.com>
@@ -12584,6 +12662,17 @@ F:     arch/arm/boot/dts/picoxcell*
 F:     arch/arm/mach-picoxcell/
 F:     drivers/crypto/picoxcell*
 
+PIDFD API
+M:     Christian Brauner <christian@brauner.io>
+L:     linux-kernel@vger.kernel.org
+S:     Maintained
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/brauner/linux.git
+F:     samples/pidfd/
+F:     tools/testing/selftests/pidfd/
+K:     (?i)pidfd
+K:     (?i)clone3
+K:     \b(clone_args|kernel_clone_args)\b
+
 PIN CONTROL SUBSYSTEM
 M:     Linus Walleij <linus.walleij@linaro.org>
 L:     linux-gpio@vger.kernel.org
@@ -12769,6 +12858,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
 
@@ -12998,7 +13088,7 @@ M:      Thierry Reding <thierry.reding@gmail.com>
 L:     linux-pwm@vger.kernel.org
 S:     Maintained
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm.git
-F:     Documentation/pwm.txt
+F:     Documentation/driver-api/pwm.rst
 F:     Documentation/devicetree/bindings/pwm/
 F:     include/linux/pwm.h
 F:     drivers/pwm/
@@ -13220,7 +13310,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>
@@ -13359,7 +13449,7 @@ F:      drivers/net/wireless/ralink/rt2x00/
 RAMDISK RAM BLOCK DEVICE DRIVER
 M:     Jens Axboe <axboe@kernel.dk>
 S:     Maintained
-F:     Documentation/blockdev/ramdisk.txt
+F:     Documentation/admin-guide/blockdev/ramdisk.rst
 F:     drivers/block/brd.c
 
 RANCHU VIRTUAL BOARD FOR MIPS
@@ -13468,7 +13558,7 @@ Q:      http://patchwork.ozlabs.org/project/rtc-linux/list/
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git
 S:     Maintained
 F:     Documentation/devicetree/bindings/rtc/
-F:     Documentation/rtc.txt
+F:     Documentation/admin-guide/rtc.rst
 F:     drivers/rtc/
 F:     include/linux/rtc.h
 F:     include/uapi/linux/rtc.h
@@ -13518,9 +13608,11 @@ L:     linux-remoteproc@vger.kernel.org
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/ohad/remoteproc.git
 S:     Maintained
 F:     Documentation/devicetree/bindings/remoteproc/
+F:     Documentation/ABI/testing/sysfs-class-remoteproc
 F:     Documentation/remoteproc.txt
 F:     drivers/remoteproc/
 F:     include/linux/remoteproc.h
+F:     include/linux/remoteproc/
 
 REMOTE PROCESSOR MESSAGING (RPMSG) SUBSYSTEM
 M:     Ohad Ben-Cohen <ohad@wizery.com>
@@ -13530,8 +13622,11 @@ T:     git git://git.kernel.org/pub/scm/linux/kernel/git/ohad/rpmsg.git
 S:     Maintained
 F:     drivers/rpmsg/
 F:     Documentation/rpmsg.txt
+F:     Documentation/ABI/testing/sysfs-bus-rpmsg
 F:     include/linux/rpmsg.h
 F:     include/linux/rpmsg/
+F:     include/uapi/linux/rpmsg.h
+F:     samples/rpmsg/
 
 RENESAS CLOCK DRIVERS
 M:     Geert Uytterhoeven <geert+renesas@glider.be>
@@ -13612,7 +13707,7 @@ W:      http://wireless.kernel.org/
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211.git
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next.git
 S:     Maintained
-F:     Documentation/rfkill.txt
+F:     Documentation/driver-api/rfkill.rst
 F:     Documentation/ABI/stable/sysfs-class-rfkill
 F:     net/rfkill/
 F:     include/linux/rfkill.h
@@ -13643,7 +13738,7 @@ RISC-V ARCHITECTURE
 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
@@ -13681,7 +13776,7 @@ ROCKETPORT DRIVER
 P:     Comtrol Corp.
 W:     http://www.comtrol.com
 S:     Maintained
-F:     Documentation/serial/rocket.rst
+F:     Documentation/driver-api/serial/rocket.rst
 F:     drivers/tty/rocket*
 
 ROCKETPORT EXPRESS/INFINITY DRIVER
@@ -14075,7 +14170,7 @@ M:      Sylwester Nawrocki <s.nawrocki@samsung.com>
 L:     linux-kernel@vger.kernel.org
 S:     Supported
 F:     Documentation/devicetree/bindings/phy/samsung-phy.txt
-F:     Documentation/phy/samsung-usb2.txt
+F:     Documentation/driver-api/phy/samsung-usb2.rst
 F:     drivers/phy/samsung/phy-exynos4210-usb2.c
 F:     drivers/phy/samsung/phy-exynos4x12-usb2.c
 F:     drivers/phy/samsung/phy-exynos5250-usb2.c
@@ -14185,7 +14280,7 @@ F:      net/sctp/
 SCx200 CPU SUPPORT
 M:     Jim Cromie <jim.cromie@gmail.com>
 S:     Odd Fixes
-F:     Documentation/i2c/busses/scx200_acb
+F:     Documentation/i2c/busses/scx200_acb.rst
 F:     arch/x86/platform/scx200/
 F:     drivers/watchdog/scx200_wdt.c
 F:     drivers/i2c/busses/scx200*
@@ -14381,7 +14476,7 @@ SGI SN-IA64 (Altix) SERIAL CONSOLE DRIVER
 M:     Pat Gefre <pfg@sgi.com>
 L:     linux-ia64@vger.kernel.org
 S:     Supported
-F:     Documentation/ia64/serial.txt
+F:     Documentation/ia64/serial.rst
 F:     drivers/tty/serial/ioc?_serial.c
 F:     include/linux/ioc?.h
 
@@ -14505,7 +14600,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
@@ -14740,6 +14835,13 @@ M:     Chris Boot <bootc@bootc.net>
 S:     Maintained
 F:     drivers/leds/leds-net48xx.c
 
+SOFT-IWARP DRIVER (siw)
+M:     Bernard Metzler <bmt@zurich.ibm.com>
+L:     linux-rdma@vger.kernel.org
+S:     Supported
+F:     drivers/infiniband/sw/siw/
+F:     include/uapi/rdma/siw-abi.h
+
 SOFT-ROCE DRIVER (rxe)
 M:     Moni Shoua <monis@mellanox.com>
 L:     linux-rdma@vger.kernel.org
@@ -14881,7 +14983,7 @@ M:      Mattia Dongili <malattia@linux.it>
 L:     platform-driver-x86@vger.kernel.org
 W:     http://www.linux.it/~malattia/wiki/index.php/Sony_drivers
 S:     Maintained
-F:     Documentation/laptops/sony-laptop.txt
+F:     Documentation/admin-guide/laptops/sony-laptop.rst
 F:     drivers/char/sonypi.c
 F:     drivers/platform/x86/sony-laptop.c
 F:     include/linux/sony-laptop.h
@@ -15299,7 +15401,7 @@ SVGA HANDLING
 M:     Martin Mares <mj@ucw.cz>
 L:     linux-video@atrey.karlin.mff.cuni.cz
 S:     Maintained
-F:     Documentation/svga.txt
+F:     Documentation/admin-guide/svga.rst
 F:     arch/x86/boot/video*
 
 SWIOTLB SUBSYSTEM
@@ -15336,7 +15438,7 @@ F:      drivers/dma-buf/dma-fence*
 F:     drivers/dma-buf/sw_sync.c
 F:     include/linux/sync_file.h
 F:     include/uapi/linux/sync_file.h
-F:     Documentation/sync_file.txt
+F:     Documentation/driver-api/sync_file.rst
 T:     git git://anongit.freedesktop.org/drm/drm-misc
 
 SYNOPSYS ARC ARCHITECTURE
@@ -15658,6 +15760,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
@@ -15813,7 +15916,7 @@ M:      Viresh Kumar <viresh.kumar@linaro.org>
 M:     Javi Merino <javi.merino@kernel.org>
 L:     linux-pm@vger.kernel.org
 S:     Supported
-F:     Documentation/thermal/cpu-cooling-api.txt
+F:     Documentation/driver-api/thermal/cpu-cooling-api.rst
 F:     drivers/thermal/cpu_cooling.c
 F:     include/linux/cpu_cooling.h
 
@@ -15957,7 +16060,7 @@ F:      sound/soc/codecs/isabelle*
 TI LP855x BACKLIGHT DRIVER
 M:     Milo Kim <milo.kim@ti.com>
 S:     Maintained
-F:     Documentation/backlight/lp855x-driver.txt
+F:     Documentation/driver-api/backlight/lp855x-driver.rst
 F:     drivers/video/backlight/lp855x_bl.c
 F:     include/linux/platform_data/lp855x.h
 
@@ -16221,7 +16324,7 @@ M:      Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 M:     Jiri Slaby <jslaby@suse.com>
 S:     Supported
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git
-F:     Documentation/serial/
+F:     Documentation/driver-api/serial/
 F:     drivers/tty/
 F:     drivers/tty/serial/serial_core.c
 F:     include/linux/serial_core.h
@@ -16832,7 +16935,7 @@ R:      Cornelia Huck <cohuck@redhat.com>
 L:     kvm@vger.kernel.org
 T:     git git://github.com/awilliam/linux-vfio.git
 S:     Maintained
-F:     Documentation/vfio.txt
+F:     Documentation/driver-api/vfio.rst
 F:     drivers/vfio/
 F:     include/linux/vfio.h
 F:     include/uapi/linux/vfio.h
@@ -16841,7 +16944,7 @@ VFIO MEDIATED DEVICE DRIVERS
 M:     Kirti Wankhede <kwankhede@nvidia.com>
 L:     kvm@vger.kernel.org
 S:     Maintained
-F:     Documentation/vfio-mediated-device.txt
+F:     Documentation/driver-api/vfio-mediated-device.rst
 F:     drivers/vfio/mdev/
 F:     include/linux/mdev.h
 F:     samples/vfio-mdev/
@@ -17029,6 +17132,13 @@ S:     Maintained
 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>
+L:     virtualization@lists.linux-foundation.org
+S:     Maintained
+F:     drivers/iommu/virtio-iommu.c
+F:     include/uapi/linux/virtio_iommu.h
+
 VIRTUAL BOX GUEST DEVICE DRIVER
 M:     Hans de Goede <hdegoede@redhat.com>
 M:     Arnd Bergmann <arnd@arndb.de>
@@ -17080,7 +17190,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
@@ -17561,9 +17672,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/
@@ -17716,7 +17826,7 @@ R:      Sergey Senozhatsky <sergey.senozhatsky.work@gmail.com>
 L:     linux-kernel@vger.kernel.org
 S:     Maintained
 F:     drivers/block/zram/
-F:     Documentation/blockdev/zram.txt
+F:     Documentation/admin-guide/blockdev/zram.rst
 
 ZS DECSTATION Z85C30 SERIAL DRIVER
 M:     "Maciej W. Rozycki" <macro@linux-mips.org>