Merge tag 'mmc-v5.4' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc
[linux-2.6-block.git] / MAINTAINERS
index c470187348c4cdfa398a850b2b8478863bdf3a09..97126a2bbb244e482c173d881a6a5bc38146c08d 100644 (file)
@@ -517,14 +517,6 @@ W: http://ez.analog.com/community/linux-device-drivers
 S:     Supported
 F:     drivers/video/backlight/adp8860_bl.c
 
-ADS1015 HARDWARE MONITOR DRIVER
-M:     Dirk Eibach <eibach@gdsys.de>
-L:     linux-hwmon@vger.kernel.org
-S:     Maintained
-F:     Documentation/hwmon/ads1015.rst
-F:     drivers/hwmon/ads1015.c
-F:     include/linux/platform_data/ads1015.h
-
 ADT746X FAN DRIVER
 M:     Colin Leroy <colin@colino.net>
 S:     Maintained
@@ -666,7 +658,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
@@ -1350,8 +1342,7 @@ M:        Will Deacon <will@kernel.org>
 R:     Robin Murphy <robin.murphy@arm.com>
 L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:     Maintained
-F:     drivers/iommu/arm-smmu.c
-F:     drivers/iommu/arm-smmu-v3.c
+F:     drivers/iommu/arm-smmu*
 F:     drivers/iommu/io-pgtable-arm.c
 F:     drivers/iommu/io-pgtable-arm-v7s.c
 
@@ -1583,8 +1574,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-*
@@ -1627,6 +1618,21 @@ F:       drivers/clocksource/timer-atlas7.c
 N:     [^a-z]sirf
 X:     drivers/gnss
 
+ARM/CZ.NIC TURRIS MOX SUPPORT
+M:     Marek Behun <marek.behun@nic.cz>
+W:     http://mox.turris.cz
+S:     Maintained
+F:     Documentation/ABI/testing/debugfs-moxtet
+F:     Documentation/ABI/testing/sysfs-bus-moxtet-devices
+F:     Documentation/ABI/testing/sysfs-firmware-turris-mox-rwtm
+F:     Documentation/devicetree/bindings/bus/moxtet.txt
+F:     Documentation/devicetree/bindings/firmware/cznic,turris-mox-rwtm.txt
+F:     Documentation/devicetree/bindings/gpio/gpio-moxtet.txt
+F:     include/linux/moxtet.h
+F:     drivers/bus/moxtet.c
+F:     drivers/firmware/turris-mox-rwtm.c
+F:     drivers/gpio/gpio-moxtet.c
+
 ARM/EBSA110 MACHINE SUPPORT
 M:     Russell King <linux@armlinux.org.uk>
 L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
@@ -1750,20 +1756,11 @@ L:      linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:     Maintained
 F:     arch/arm/mach-pxa/colibri-pxa270-income.c
 
-ARM/INTEL IOP13XX ARM ARCHITECTURE
-M:     Lennert Buytenhek <kernel@wantstofly.org>
-L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
-S:     Maintained
-
 ARM/INTEL IOP32X ARM ARCHITECTURE
 M:     Lennert Buytenhek <kernel@wantstofly.org>
 L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:     Maintained
 
-ARM/INTEL IOP33X ARM ARCHITECTURE
-L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
-S:     Orphan
-
 ARM/INTEL IQ81342EX MACHINE SUPPORT
 M:     Lennert Buytenhek <kernel@wantstofly.org>
 L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
@@ -1922,12 +1919,6 @@ S:       Maintained
 F:     drivers/phy/mediatek/
 F:     Documentation/devicetree/bindings/phy/phy-mtk-*
 
-ARM/MICREL KS8695 ARCHITECTURE
-M:     Greg Ungerer <gerg@uclinux.org>
-L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
-F:     arch/arm/mach-ks8695/
-S:     Odd Fixes
-
 ARM/Microchip (AT91) SoC support
 M:     Nicolas Ferre <nicolas.ferre@microchip.com>
 M:     Alexandre Belloni <alexandre.belloni@bootlin.com>
@@ -1969,6 +1960,7 @@ F:        Documentation/devicetree/bindings/i2c/i2c-stu300.txt
 F:     arch/arm/mach-nomadik/
 F:     arch/arm/mach-u300/
 F:     arch/arm/mach-ux500/
+F:     drivers/soc/ux500/
 F:     arch/arm/boot/dts/ste-*
 F:     drivers/clk/clk-nomadik.c
 F:     drivers/clk/clk-u300.c
@@ -2012,22 +2004,6 @@ F:       drivers/*/*npcm*
 F:     Documentation/devicetree/bindings/*/*npcm*
 F:     Documentation/devicetree/bindings/*/*/*npcm*
 
-ARM/NUVOTON W90X900 ARM ARCHITECTURE
-M:     Wan ZongShun <mcuos.com@gmail.com>
-L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
-W:     http://www.mcuos.com
-S:     Maintained
-F:     arch/arm/mach-w90x900/
-F:     drivers/input/keyboard/w90p910_keypad.c
-F:     drivers/input/touchscreen/w90p910_ts.c
-F:     drivers/watchdog/nuc900_wdt.c
-F:     drivers/net/ethernet/nuvoton/w90p910_ether.c
-F:     drivers/mtd/nand/raw/nuc900_nand.c
-F:     drivers/rtc/rtc-nuc900.c
-F:     drivers/spi/spi-nuc900.c
-F:     drivers/usb/host/ehci-w90x900.c
-F:     drivers/video/fbdev/nuc900fb.c
-
 ARM/OPENMOKO NEO FREERUNNER (GTA02) MACHINE SUPPORT
 L:     openmoko-kernel@lists.openmoko.org (subscribers-only)
 W:     http://wiki.openmoko.org/wiki/Neo_FreeRunner
@@ -2220,8 +2196,9 @@ F:        drivers/*/*s3c24*
 F:     drivers/*/*/*s3c24*
 F:     drivers/*/*s3c64xx*
 F:     drivers/*/*s5pv210*
-F:     drivers/memory/samsung/*
-F:     drivers/soc/samsung/*
+F:     drivers/memory/samsung/
+F:     drivers/soc/samsung/
+F:     include/linux/soc/samsung/
 F:     Documentation/arm/samsung/
 F:     Documentation/devicetree/bindings/arm/samsung/
 F:     Documentation/devicetree/bindings/sram/samsung-sram.txt
@@ -4104,7 +4081,7 @@ L:        samba-technical@lists.samba.org (moderated for non-subscribers)
 W:     http://linux-cifs.samba.org/
 T:     git git://git.samba.org/sfrench/cifs-2.6.git
 S:     Supported
-F:     Documentation/filesystems/cifs/
+F:     Documentation/admin-guide/cifs/
 F:     fs/cifs/
 
 COMPACTPCI HOTPLUG CORE
@@ -4291,6 +4268,14 @@ S:       Supported
 F:     drivers/cpuidle/cpuidle-exynos.c
 F:     arch/arm/mach-exynos/pm.c
 
+CPUIDLE DRIVER - ARM PSCI
+M:     Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
+M:     Sudeep Holla <sudeep.holla@arm.com>
+L:     linux-pm@vger.kernel.org
+L:     linux-arm-kernel@lists.infradead.org
+S:     Supported
+F:     drivers/cpuidle/cpuidle-psci.c
+
 CPU IDLE TIME MANAGEMENT FRAMEWORK
 M:     "Rafael J. Wysocki" <rjw@rjwysocki.net>
 M:     Daniel Lezcano <daniel.lezcano@linaro.org>
@@ -4952,7 +4937,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/
@@ -4968,6 +4955,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
@@ -5762,6 +5757,11 @@ S:       Supported
 F:     drivers/edac/aspeed_edac.c
 F:     Documentation/devicetree/bindings/edac/aspeed-sdram-edac.txt
 
+EDAC-BLUEFIELD
+M:     Shravan Kumar Ramani <sramani@mellanox.com>
+S:     Supported
+F:     drivers/edac/bluefield_edac.c
+
 EDAC-CALXEDA
 M:     Robert Richter <rric@kernel.org>
 L:     linux-edac@vger.kernel.org
@@ -5786,10 +5786,11 @@ F:      drivers/edac/thunderx_edac*
 EDAC-CORE
 M:     Borislav Petkov <bp@alien8.de>
 M:     Mauro Carvalho Chehab <mchehab@kernel.org>
+M:     Tony Luck <tony.luck@intel.com>
 R:     James Morse <james.morse@arm.com>
+R:     Robert Richter <rrichter@marvell.com>
 L:     linux-edac@vger.kernel.org
-T:     git git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp.git for-next
-T:     git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-edac.git linux_next
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras.git edac-for-next
 S:     Supported
 F:     Documentation/admin-guide/ras.rst
 F:     Documentation/driver-api/edac.rst
@@ -6322,7 +6323,7 @@ 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
 
@@ -6332,15 +6333,6 @@ S:       Odd Fixes
 L:     linux-block@vger.kernel.org
 F:     drivers/block/floppy.c
 
-FMC SUBSYSTEM
-M:     Alessandro Rubini <rubini@gnudd.com>
-W:     http://www.ohwr.org/projects/fmc-bus
-S:     Supported
-F:     drivers/fmc/
-F:     include/linux/fmc*.h
-F:     include/linux/ipmi-fru.h
-K:     fmc_d.*register
-
 FPGA MANAGER FRAMEWORK
 M:     Moritz Fischer <mdf@kernel.org>
 L:     linux-fpga@vger.kernel.org
@@ -6440,6 +6432,7 @@ M:        Frank Li <Frank.li@nxp.com>
 L:     linux-arm-kernel@lists.infradead.org
 S:     Maintained
 F:     drivers/perf/fsl_imx8_ddr_perf.c
+F:     Documentation/admin-guide/perf/imx-ddr.rst
 F:     Documentation/devicetree/bindings/perf/fsl-imx-ddr.txt
 
 FREESCALE IMX I2C DRIVER
@@ -6733,6 +6726,13 @@ W:       https://linuxtv.org
 S:     Maintained
 F:     drivers/media/radio/radio-gemtek*
 
+GENERIC ARCHITECTURE TOPOLOGY
+M:     Sudeep Holla <sudeep.holla@arm.com>
+L:     linux-kernel@vger.kernel.org
+S:     Maintained
+F:     drivers/base/arch_topology.c
+F:     include/linux/arch_topology.h
+
 GENERIC GPIO I2C DRIVER
 M:     Wolfram Sang <wsa+renesas@sang-engineering.com>
 S:     Supported
@@ -6745,7 +6745,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>
@@ -7494,14 +7494,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*
@@ -7521,8 +7521,8 @@ 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
 
@@ -7556,7 +7556,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
@@ -7570,19 +7570,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
@@ -7611,7 +7611,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>
@@ -8361,7 +8361,7 @@ M:        linux-wimax@intel.com
 L:     wimax@linuxwimax.org (subscribers-only)
 S:     Supported
 W:     http://linuxwimax.org
-F:     Documentation/wimax/README.i2400m
+F:     Documentation/admin-guide/wimax/i2400m.rst
 F:     drivers/net/wimax/i2400m/
 F:     include/uapi/linux/wimax/i2400m.h
 
@@ -8386,12 +8386,6 @@ F:       Documentation/x86/intel_txt.rst
 F:     include/linux/tboot.h
 F:     arch/x86/kernel/tboot.c
 
-INTEL-MID GPIO DRIVER
-M:     David Cohen <david.a.cohen@linux.intel.com>
-L:     linux-gpio@vger.kernel.org
-S:     Maintained
-F:     drivers/gpio/gpio-intel-mid.c
-
 INTERCONNECT API
 M:     Georgi Djakov <georgi.djakov@linaro.org>
 L:     linux-pm@vger.kernel.org
@@ -8416,12 +8410,6 @@ L:       linux-mips@vger.kernel.org
 S:     Maintained
 F:     drivers/net/ethernet/sgi/ioc3-eth.c
 
-IOC3 SERIAL DRIVER
-M:     Pat Gefre <pfg@sgi.com>
-L:     linux-serial@vger.kernel.org
-S:     Maintained
-F:     drivers/tty/serial/ioc3_serial.c
-
 IOMAP FILESYSTEM LIBRARY
 M:     Christoph Hellwig <hch@infradead.org>
 M:     Darrick J. Wong <darrick.wong@oracle.com>
@@ -8658,7 +8646,7 @@ L:        jfs-discussion@lists.sourceforge.net
 W:     http://jfs.sourceforge.net/
 T:     git git://github.com/kleikamp/linux-shaggy.git
 S:     Maintained
-F:     Documentation/filesystems/jfs.txt
+F:     Documentation/admin-guide/jfs.rst
 F:     fs/jfs/
 
 JME NETWORK DRIVER
@@ -8934,7 +8922,7 @@ F:        security/keys/encrypted-keys/
 
 KEYS-TRUSTED
 M:     James Bottomley <jejb@linux.ibm.com>
-M:      Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
+M:     Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
 M:     Mimi Zohar <zohar@linux.ibm.com>
 L:     linux-integrity@vger.kernel.org
 L:     keyrings@vger.kernel.org
@@ -9001,7 +8989,7 @@ F:        kernel/kprobes.c
 KS0108 LCD CONTROLLER DRIVER
 M:     Miguel Ojeda Sandonis <miguel.ojeda.sandonis@gmail.com>
 S:     Maintained
-F:     Documentation/auxdisplay/ks0108
+F:     Documentation/admin-guide/auxdisplay/ks0108.rst
 F:     drivers/auxdisplay/ks0108.c
 F:     include/linux/ks0108.h
 
@@ -9348,7 +9336,7 @@ F:        drivers/misc/lkdtm/*
 
 LINUX KERNEL MEMORY CONSISTENCY MODEL (LKMM)
 M:     Alan Stern <stern@rowland.harvard.edu>
-M:     Andrea Parri <andrea.parri@amarulasolutions.com>
+M:     Andrea Parri <parri.andrea@gmail.com>
 M:     Will Deacon <will@kernel.org>
 M:     Peter Zijlstra <peterz@infradead.org>
 M:     Boqun Feng <boqun.feng@gmail.com>
@@ -9356,7 +9344,7 @@ M:        Nicholas Piggin <npiggin@gmail.com>
 M:     David Howells <dhowells@redhat.com>
 M:     Jade Alglave <j.alglave@ucl.ac.uk>
 M:     Luc Maranget <luc.maranget@inria.fr>
-M:     "Paul E. McKenney" <paulmck@linux.ibm.com>
+M:     "Paul E. McKenney" <paulmck@kernel.org>
 R:     Akira Yokosawa <akiyks@gmail.com>
 R:     Daniel Lustig <dlustig@nvidia.com>
 L:     linux-kernel@vger.kernel.org
@@ -9590,7 +9578,7 @@ F:        Documentation/networking/mac80211-injection.txt
 F:     include/net/mac80211.h
 F:     net/mac80211/
 F:     drivers/net/wireless/mac80211_hwsim.[ch]
-F:     Documentation/networking/mac80211_hwsim/README
+F:     Documentation/networking/mac80211_hwsim/mac80211_hwsim.rst
 
 MAILBOX API
 M:     Jassi Brar <jassisinghbrar@gmail.com>
@@ -10039,8 +10027,8 @@ L:      linux-media@vger.kernel.org
 L:     linux-renesas-soc@vger.kernel.org
 T:     git git://linuxtv.org/media_tree.git
 S:     Supported
-F:     Documentation/devicetree/bindings/media/renesas,rcar-csi2.txt
-F:     Documentation/devicetree/bindings/media/rcar_vin.txt
+F:     Documentation/devicetree/bindings/media/renesas,csi2.txt
+F:     Documentation/devicetree/bindings/media/renesas,vin.txt
 F:     drivers/media/platform/rcar-vin/
 
 MEDIA DRIVERS FOR RENESAS - VSP1
@@ -10367,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>
@@ -10385,7 +10373,7 @@ F:      drivers/platform/x86/mlx-platform.c
 
 MEMBARRIER SUPPORT
 M:     Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
-M:     "Paul E. McKenney" <paulmck@linux.ibm.com>
+M:     "Paul E. McKenney" <paulmck@kernel.org>
 L:     linux-kernel@vger.kernel.org
 S:     Supported
 F:     kernel/sched/membarrier.c
@@ -10637,12 +10625,6 @@ M:     Nicolas Ferre <nicolas.ferre@microchip.com>
 S:     Supported
 F:     drivers/power/reset/at91-sama5d2_shdwc.c
 
-MICROCHIP SAMA5D2-COMPATIBLE PIOBU GPIO
-M:     Andrei Stefanescu <andrei.stefanescu@microchip.com>
-L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
-L:     linux-gpio@vger.kernel.org
-F:     drivers/gpio/gpio-sama5d2-piobu.c
-
 MICROCHIP SPI DRIVER
 M:     Nicolas Ferre <nicolas.ferre@microchip.com>
 S:     Supported
@@ -10655,13 +10637,6 @@ S:     Supported
 F:     drivers/misc/atmel-ssc.c
 F:     include/linux/atmel-ssc.h
 
-MICROCHIP TIMER COUNTER (TC) AND CLOCKSOURCE DRIVERS
-M:     Nicolas Ferre <nicolas.ferre@microchip.com>
-L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
-S:     Supported
-F:     drivers/misc/atmel_tclib.c
-F:     drivers/clocksource/tcb_clksrc.c
-
 MICROCHIP USBA UDC DRIVER
 M:     Cristian Birsan <cristian.birsan@microchip.com>
 L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
@@ -11990,7 +11965,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
 
@@ -12113,7 +12088,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>
@@ -12614,6 +12589,7 @@ PERFORMANCE EVENTS SUBSYSTEM
 M:     Peter Zijlstra <peterz@infradead.org>
 M:     Ingo Molnar <mingo@redhat.com>
 M:     Arnaldo Carvalho de Melo <acme@kernel.org>
+R:     Mark Rutland <mark.rutland@arm.com>
 R:     Alexander Shishkin <alexander.shishkin@linux.intel.com>
 R:     Jiri Olsa <jolsa@redhat.com>
 R:     Namhyung Kim <namhyung@kernel.org>
@@ -12703,6 +12679,7 @@ L:      linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 L:     linux-gpio@vger.kernel.org
 S:     Supported
 F:     drivers/pinctrl/pinctrl-at91*
+F:     drivers/gpio/gpio-sama5d2-piobu.c
 
 PIN CONTROLLER - FREESCALE
 M:     Dong Aisheng <aisheng.dong@nxp.com>
@@ -13500,7 +13477,7 @@ S:      Orphan
 F:     drivers/net/wireless/ray*
 
 RCUTORTURE TEST FRAMEWORK
-M:     "Paul E. McKenney" <paulmck@linux.ibm.com>
+M:     "Paul E. McKenney" <paulmck@kernel.org>
 M:     Josh Triplett <josh@joshtriplett.org>
 R:     Steven Rostedt <rostedt@goodmis.org>
 R:     Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
@@ -13547,7 +13524,7 @@ F:      arch/x86/include/asm/resctrl_sched.h
 F:     Documentation/x86/resctrl*
 
 READ-COPY UPDATE (RCU)
-M:     "Paul E. McKenney" <paulmck@linux.ibm.com>
+M:     "Paul E. McKenney" <paulmck@kernel.org>
 M:     Josh Triplett <josh@joshtriplett.org>
 R:     Steven Rostedt <rostedt@goodmis.org>
 R:     Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
@@ -13705,7 +13682,7 @@ F:      include/linux/reset-controller.h
 RESTARTABLE SEQUENCES SUPPORT
 M:     Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
 M:     Peter Zijlstra <peterz@infradead.org>
-M:     "Paul E. McKenney" <paulmck@linux.ibm.com>
+M:     "Paul E. McKenney" <paulmck@kernel.org>
 M:     Boqun Feng <boqun.feng@gmail.com>
 L:     linux-kernel@vger.kernel.org
 S:     Supported
@@ -14136,6 +14113,8 @@ M:      Kamil Konieczny <k.konieczny@partner.samsung.com>
 L:     linux-crypto@vger.kernel.org
 L:     linux-samsung-soc@vger.kernel.org
 S:     Maintained
+F:     Documentation/devicetree/bindings/crypto/samsung-slimsss.txt
+F:     Documentation/devicetree/bindings/crypto/samsung-sss.txt
 F:     drivers/crypto/s5p-sss.c
 
 SAMSUNG S5P/EXYNOS4 SOC SERIES CAMERA SUBSYSTEM DRIVERS
@@ -14156,6 +14135,8 @@ T:      git git://git.kernel.org/pub/scm/linux/kernel/git/snawrocki/clk.git
 F:     drivers/clk/samsung/
 F:     include/dt-bindings/clock/exynos*.h
 F:     Documentation/devicetree/bindings/clock/exynos*.txt
+F:     Documentation/devicetree/bindings/clock/samsung,s3c*
+F:     Documentation/devicetree/bindings/clock/samsung,s5p*
 
 SAMSUNG SPI DRIVERS
 M:     Kukjin Kim <kgene@kernel.org>
@@ -14206,6 +14187,12 @@ F:     drivers/watchdog/sc1200wdt.c
 SCHEDULER
 M:     Ingo Molnar <mingo@redhat.com>
 M:     Peter Zijlstra <peterz@infradead.org>
+M:     Juri Lelli <juri.lelli@redhat.com> (SCHED_DEADLINE)
+M:     Vincent Guittot <vincent.guittot@linaro.org> (SCHED_NORMAL)
+R:     Dietmar Eggemann <dietmar.eggemann@arm.com> (SCHED_NORMAL)
+R:     Steven Rostedt <rostedt@goodmis.org> (SCHED_FIFO/SCHED_RR)
+R:     Ben Segall <bsegall@google.com> (CONFIG_CFS_BANDWIDTH)
+R:     Mel Gorman <mgorman@suse.de> (CONFIG_NUMA_BALANCING)
 L:     linux-kernel@vger.kernel.org
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git sched/core
 S:     Maintained
@@ -14300,7 +14287,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*
@@ -14741,7 +14728,7 @@ F:      mm/sl?b*
 
 SLEEPABLE READ-COPY UPDATE (SRCU)
 M:     Lai Jiangshan <jiangshanlai@gmail.com>
-M:     "Paul E. McKenney" <paulmck@linux.ibm.com>
+M:     "Paul E. McKenney" <paulmck@kernel.org>
 M:     Josh Triplett <josh@joshtriplett.org>
 R:     Steven Rostedt <rostedt@goodmis.org>
 R:     Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
@@ -15576,6 +15563,7 @@ F:      drivers/clk/clk-sc[mp]i.c
 F:     drivers/cpufreq/sc[mp]i-cpufreq.c
 F:     drivers/firmware/arm_scpi.c
 F:     drivers/firmware/arm_scmi/
+F:     drivers/reset/reset-scmi.c
 F:     include/linux/sc[mp]i_protocol.h
 
 SYSTEM RESET/SHUTDOWN DRIVERS
@@ -15884,6 +15872,7 @@ F:      drivers/firmware/ti_sci*
 F:     include/linux/soc/ti/ti_sci_protocol.h
 F:     Documentation/devicetree/bindings/soc/ti/sci-pm-domain.txt
 F:     drivers/soc/ti/ti_sci_pm_domains.c
+F:     include/dt-bindings/soc/ti,sci_pm_domain.h
 F:     Documentation/devicetree/bindings/reset/ti,sci-reset.txt
 F:     Documentation/devicetree/bindings/clock/ti,sci-clk.txt
 F:     drivers/clk/keystone/sci-clk.c
@@ -15937,7 +15926,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.rst
+F:     Documentation/driver-api/thermal/cpu-cooling-api.rst
 F:     drivers/thermal/cpu_cooling.c
 F:     include/linux/cpu_cooling.h
 
@@ -16238,7 +16227,7 @@ F:      drivers/platform/x86/topstar-laptop.c
 
 TORTURE-TEST MODULES
 M:     Davidlohr Bueso <dave@stgolabs.net>
-M:     "Paul E. McKenney" <paulmck@linux.ibm.com>
+M:     "Paul E. McKenney" <paulmck@kernel.org>
 M:     Josh Triplett <josh@joshtriplett.org>
 L:     linux-kernel@vger.kernel.org
 S:     Supported
@@ -16460,7 +16449,7 @@ F:      drivers/hid/hid-udraw-ps3.c
 UFS FILESYSTEM
 M:     Evgeniy Dushistov <dushistov@mail.ru>
 S:     Maintained
-F:     Documentation/filesystems/ufs.txt
+F:     Documentation/admin-guide/ufs.rst
 F:     fs/ufs/
 
 UHID USERSPACE HID IO DRIVER:
@@ -17215,6 +17204,7 @@ M:      "VMware, Inc." <pv-drivers@vmware.com>
 L:     virtualization@lists.linux-foundation.org
 S:     Supported
 F:     arch/x86/kernel/cpu/vmware.c
+F:     arch/x86/include/asm/vmware.h
 
 VMWARE PVRDMA DRIVER
 M:     Adit Ranadive <aditr@vmware.com>
@@ -17264,6 +17254,7 @@ F:      Documentation/power/regulator/
 F:     drivers/regulator/
 F:     include/dt-bindings/regulator/
 F:     include/linux/regulator/
+K:     regulator_get_optional
 
 VRF
 M:     David Ahern <dsa@cumulusnetworks.com>
@@ -17378,7 +17369,7 @@ M:      linux-wimax@intel.com
 L:     wimax@linuxwimax.org (subscribers-only)
 S:     Supported
 W:     http://linuxwimax.org
-F:     Documentation/wimax/README.wimax
+F:     Documentation/admin-guide/wimax/wimax.rst
 F:     include/linux/wimax/debug.h
 F:     include/net/wimax.h
 F:     include/uapi/linux/wimax.h
@@ -17532,7 +17523,7 @@ M:      Darren Hart <dvhart@infradead.org>
 M:     Andy Shevchenko <andy@infradead.org>
 L:     platform-driver-x86@vger.kernel.org
 T:     git git://git.infradead.org/linux-platform-drivers-x86.git
-S:     Maintained
+S:     Odd Fixes
 F:     drivers/platform/x86/
 F:     drivers/platform/olpc/
 
@@ -17700,8 +17691,7 @@ F:      include/uapi/linux/dqblk_xfs.h
 F:     include/uapi/linux/fsmap.h
 
 XILINX AXI ETHERNET DRIVER
-M:     Anirudha Sarangi <anirudh@xilinx.com>
-M:     John Linn <John.Linn@xilinx.com>
+M:     Radhey Shyam Pandey <radhey.shyam.pandey@xilinx.com>
 S:     Maintained
 F:     drivers/net/ethernet/xilinx/xilinx_axienet*