Merge tag 'pinctrl-v5.7-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw...
[linux-2.6-microblaze.git] / MAINTAINERS
index 9fa5b2f..0ffb164 100644 (file)
@@ -214,7 +214,7 @@ Q:  http://patchwork.kernel.org/project/v9fs-devel/list/
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs.git
 T:     git git://github.com/martinetd/linux.git
 S:     Maintained
-F:     Documentation/filesystems/9p.txt
+F:     Documentation/filesystems/9p.rst
 F:     fs/9p/
 F:     net/9p/
 F:     include/net/9p/
@@ -303,8 +303,8 @@ F:  drivers/net/ethernet/alteon/acenic*
 ACER ASPIRE ONE TEMPERATURE AND FAN DRIVER
 M:     Peter Kaestle <peter@piie.net>
 L:     platform-driver-x86@vger.kernel.org
-W:     http://piie.net/?section=acerhdf
 S:     Maintained
+W:     http://piie.net/?section=acerhdf
 F:     drivers/platform/x86/acerhdf.c
 
 ACER WMI LAPTOP EXTRAS
@@ -584,7 +584,7 @@ AFFS FILE SYSTEM
 M:     David Sterba <dsterba@suse.com>
 L:     linux-fsdevel@vger.kernel.org
 S:     Odd Fixes
-F:     Documentation/filesystems/affs.txt
+F:     Documentation/filesystems/affs.rst
 F:     fs/affs/
 
 AFS FILESYSTEM
@@ -593,7 +593,7 @@ L:  linux-afs@lists.infradead.org
 S:     Supported
 F:     fs/afs/
 F:     include/trace/events/afs.h
-F:     Documentation/filesystems/afs.txt
+F:     Documentation/filesystems/afs.rst
 W:     https://www.infradead.org/~dhowells/kafs/
 
 AGPGART DRIVER
@@ -931,6 +931,14 @@ S: Supported
 F:     drivers/iio/adc/ad7124.c
 F:     Documentation/devicetree/bindings/iio/adc/adi,ad7124.yaml
 
+ANALOG DEVICES INC AD7192 DRIVER
+M:     Alexandru Tachici <alexandru.tachici@analog.com>
+L:     linux-iio@vger.kernel.org
+W:     http://ez.analog.com/community/linux-device-drivers
+S:     Supported
+F:     drivers/iio/adc/ad7192.c
+F:     Documentation/devicetree/bindings/iio/adc/adi,ad7192.yaml
+
 ANALOG DEVICES INC AD7292 DRIVER
 M:     Marcelo Schmitt <marcelo.schmitt1@gmail.com>
 L:     linux-iio@vger.kernel.org
@@ -1081,6 +1089,15 @@ F:       drivers/iio/adc/ltc249*
 X:     drivers/iio/*/adjd*
 F:     drivers/staging/iio/*/ad*
 
+ANALOG DEVICES INC HMC425A DRIVER
+M:     Beniamin Bia <beniamin.bia@analog.com>
+M:     Michael Hennerich <michael.hennerich@analog.com>
+L:     linux-iio@vger.kernel.org
+S:     Supported
+W:     http://ez.analog.com/community/linux-device-drivers
+F:     Documentation/devicetree/bindings/iio/amplifiers/adi,hmc425a.yaml
+F:     drivers/iio/amplifiers/hmc425a.c
+
 ANALOGBITS PLL LIBRARIES
 M:     Paul Walmsley <paul.walmsley@sifive.com>
 S:     Supported
@@ -2276,6 +2293,7 @@ T:        git git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip.git
 S:     Maintained
 F:     Documentation/devicetree/bindings/i2c/i2c-rk3x.txt
 F:     Documentation/devicetree/bindings/mmc/rockchip-dw-mshc.yaml
+F:     Documentation/devicetree/bindings/spi/spi-rockchip.yaml
 F:     arch/arm/boot/dts/rk3*
 F:     arch/arm/boot/dts/rv1108*
 F:     arch/arm/mach-rockchip/
@@ -2725,8 +2743,8 @@ L:        linux-aspeed@lists.ozlabs.org (moderated for non-subscribers)
 L:     openbmc@lists.ozlabs.org (moderated for non-subscribers)
 L:     linux-gpio@vger.kernel.org
 S:     Maintained
-F:     drivers/pinctrl/aspeed/
 F:     Documentation/devicetree/bindings/pinctrl/aspeed,*
+F:     drivers/pinctrl/aspeed/
 
 ASPEED SCU INTERRUPT CONTROLLER DRIVER
 M:     Eddie James <eajames@linux.ibm.com>
@@ -2748,8 +2766,8 @@ ASUS NOTEBOOKS AND EEEPC ACPI/WMI EXTRAS DRIVERS
 M:     Corentin Chary <corentin.chary@gmail.com>
 L:     acpi4asus-user@lists.sourceforge.net
 L:     platform-driver-x86@vger.kernel.org
-W:     http://acpi4asus.sf.net
 S:     Maintained
+W:     http://acpi4asus.sf.net
 F:     drivers/platform/x86/asus*.c
 F:     drivers/platform/x86/eeepc*.c
 
@@ -2957,6 +2975,14 @@ S:       Maintained
 F:     Documentation/devicetree/bindings/sound/axentia,*
 F:     sound/soc/atmel/tse850-pcm5142.c
 
+AXI-FAN-CONTROL HARDWARE MONITOR DRIVER
+M:     Nuno Sá <nuno.sa@analog.com>
+W:     http://ez.analog.com/community/linux-device-drivers
+L:     linux-hwmon@vger.kernel.org
+S:     Supported
+F:     drivers/hwmon/axi-fan-control.c
+F:     Documentation/devicetree/bindings/hwmon/adi,axi-fan-control.yaml
+
 AXXIA I2C CONTROLLER
 M:     Krzysztof Adamski <krzysztof.adamski@nokia.com>
 L:     linux-i2c@vger.kernel.org
@@ -3063,7 +3089,7 @@ M:        Luis de Bethencourt <luisbg@kernel.org>
 M:     Salah Triki <salah.triki@gmail.com>
 S:     Maintained
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/luisbg/linux-befs.git
-F:     Documentation/filesystems/befs.txt
+F:     Documentation/filesystems/befs.rst
 F:     fs/befs/
 
 BFQ I/O SCHEDULER
@@ -3077,7 +3103,7 @@ F:        Documentation/block/bfq-iosched.rst
 BFS FILE SYSTEM
 M:     "Tigran A. Aivazian" <aivazian.tigran@gmail.com>
 S:     Maintained
-F:     Documentation/filesystems/bfs.txt
+F:     Documentation/filesystems/bfs.rst
 F:     fs/bfs/
 F:     include/uapi/linux/bfs_fs.h
 
@@ -3147,6 +3173,8 @@ R:        Martin KaFai Lau <kafai@fb.com>
 R:     Song Liu <songliubraving@fb.com>
 R:     Yonghong Song <yhs@fb.com>
 R:     Andrii Nakryiko <andriin@fb.com>
+R:     John Fastabend <john.fastabend@gmail.com>
+R:     KP Singh <kpsingh@chromium.org>
 L:     netdev@vger.kernel.org
 L:     bpf@vger.kernel.org
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf.git
@@ -3621,7 +3649,7 @@ W:        http://btrfs.wiki.kernel.org/
 Q:     http://patchwork.kernel.org/project/linux-btrfs/list/
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs.git
 S:     Maintained
-F:     Documentation/filesystems/btrfs.txt
+F:     Documentation/filesystems/btrfs.rst
 F:     fs/btrfs/
 F:     include/linux/btrfs*
 F:     include/uapi/linux/btrfs*
@@ -3918,7 +3946,7 @@ W:        http://ceph.com/
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client.git
 T:     git git://github.com/ceph/ceph-client.git
 S:     Supported
-F:     Documentation/filesystems/ceph.txt
+F:     Documentation/filesystems/ceph.rst
 F:     fs/ceph/
 
 CERTIFICATE HANDLING
@@ -3931,11 +3959,6 @@ F:       certs/
 F:     scripts/sign-file.c
 F:     scripts/extract-cert.c
 
-CERTIFIED WIRELESS USB (WUSB) SUBSYSTEM
-L:     devel@driverdev.osuosl.org
-S:     Obsolete
-F:     drivers/staging/wusbcore/
-
 CFAG12864B LCD DRIVER
 M:     Miguel Ojeda Sandonis <miguel.ojeda.sandonis@gmail.com>
 S:     Maintained
@@ -4129,6 +4152,7 @@ B:        https://github.com/ClangBuiltLinux/linux/issues
 C:     irc://chat.freenode.net/clangbuiltlinux
 S:     Supported
 K:     \b(?i:clang|llvm)\b
+F:     Documentation/kbuild/llvm.rst
 
 CLEANCACHE API
 M:     Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
@@ -4434,7 +4458,7 @@ F:        include/linux/cpuidle.h
 CRAMFS FILESYSTEM
 M:     Nicolas Pitre <nico@fluxnic.net>
 S:     Maintained
-F:     Documentation/filesystems/cramfs.txt
+F:     Documentation/filesystems/cramfs.rst
 F:     fs/cramfs/
 
 CREATIVE SB0540
@@ -4553,7 +4577,9 @@ S:        Supported
 F:     drivers/scsi/cxgbi/cxgb3i
 
 CXGB4 CRYPTO DRIVER (chcr)
-M:     Atul Gupta <atul.gupta@chelsio.com>
+M:     Ayush Sawal <ayush.sawal@chelsio.com>
+M:     Vinay Kumar Yadav <vinay.yadav@chelsio.com>
+M:     Rohit Maheshwari <rohitm@chelsio.com>
 L:     linux-crypto@vger.kernel.org
 W:     http://www.chelsio.com
 S:     Supported
@@ -4734,26 +4760,6 @@ S:       Maintained
 F:     drivers/media/platform/sunxi/sun8i-di/
 F:     Documentation/devicetree/bindings/media/allwinner,sun8i-h3-deinterlace.yaml
 
-DELL SMBIOS DRIVER
-M:     Pali Rohár <pali.rohar@gmail.com>
-M:     Mario Limonciello <mario.limonciello@dell.com>
-L:     platform-driver-x86@vger.kernel.org
-S:     Maintained
-F:     drivers/platform/x86/dell-smbios.*
-
-DELL SMBIOS SMM DRIVER
-M:     Mario Limonciello <mario.limonciello@dell.com>
-L:     platform-driver-x86@vger.kernel.org
-S:     Maintained
-F:     drivers/platform/x86/dell-smbios-smm.c
-
-DELL SMBIOS WMI DRIVER
-M:     Mario Limonciello <mario.limonciello@dell.com>
-L:     platform-driver-x86@vger.kernel.org
-S:     Maintained
-F:     drivers/platform/x86/dell-smbios-wmi.c
-F:     tools/wmi/dell-smbios-example.c
-
 DEFZA FDDI NETWORK DRIVER
 M:     "Maciej W. Rozycki" <macro@linux-mips.org>
 S:     Maintained
@@ -4776,17 +4782,37 @@ M:      Pali Rohár <pali.rohar@gmail.com>
 S:     Maintained
 F:     drivers/platform/x86/dell-rbtn.*
 
+DELL LAPTOP SMM DRIVER
+M:     Pali Rohár <pali.rohar@gmail.com>
+S:     Maintained
+F:     drivers/hwmon/dell-smm-hwmon.c
+F:     include/uapi/linux/i8k.h
+
 DELL REMOTE BIOS UPDATE DRIVER
 M:     Stuart Hayes <stuart.w.hayes@gmail.com>
 L:     platform-driver-x86@vger.kernel.org
 S:     Maintained
 F:     drivers/platform/x86/dell_rbu.c
 
-DELL LAPTOP SMM DRIVER
+DELL SMBIOS DRIVER
 M:     Pali Rohár <pali.rohar@gmail.com>
+M:     Mario Limonciello <mario.limonciello@dell.com>
+L:     platform-driver-x86@vger.kernel.org
 S:     Maintained
-F:     drivers/hwmon/dell-smm-hwmon.c
-F:     include/uapi/linux/i8k.h
+F:     drivers/platform/x86/dell-smbios.*
+
+DELL SMBIOS SMM DRIVER
+M:     Mario Limonciello <mario.limonciello@dell.com>
+L:     platform-driver-x86@vger.kernel.org
+S:     Maintained
+F:     drivers/platform/x86/dell-smbios-smm.c
+
+DELL SMBIOS WMI DRIVER
+M:     Mario Limonciello <mario.limonciello@dell.com>
+L:     platform-driver-x86@vger.kernel.org
+S:     Maintained
+F:     drivers/platform/x86/dell-smbios-wmi.c
+F:     tools/wmi/dell-smbios-example.c
 
 DELL SYSTEMS MANAGEMENT BASE DRIVER (dcdbas)
 M:     Stuart Hayes <stuart.w.hayes@gmail.com>
@@ -4795,17 +4821,17 @@ S:      Maintained
 F:     Documentation/driver-api/dcdbas.rst
 F:     drivers/platform/x86/dcdbas.*
 
+DELL WMI DESCRIPTOR DRIVER
+M:     Mario Limonciello <mario.limonciello@dell.com>
+S:     Maintained
+F:     drivers/platform/x86/dell-wmi-descriptor.c
+
 DELL WMI NOTIFICATIONS DRIVER
 M:     Matthew Garrett <mjg59@srcf.ucam.org>
 M:     Pali Rohár <pali.rohar@gmail.com>
 S:     Maintained
 F:     drivers/platform/x86/dell-wmi.c
 
-DELL WMI DESCRIPTOR DRIVER
-M:     Mario Limonciello <mario.limonciello@dell.com>
-S:     Maintained
-F:     drivers/platform/x86/dell-wmi-descriptor.c
-
 DELTA ST MEDIA DRIVER
 M:     Hugues Fruchet <hugues.fruchet@st.com>
 L:     linux-media@vger.kernel.org
@@ -4932,6 +4958,7 @@ F:        drivers/leds/leds-da90??.c
 F:     drivers/mfd/da903x.c
 F:     drivers/mfd/da90??-*.c
 F:     drivers/mfd/da91??-*.c
+F:     drivers/pinctrl/pinctrl-da90??.c
 F:     drivers/power/supply/da9052-battery.c
 F:     drivers/power/supply/da91??-*.c
 F:     drivers/regulator/da903x.c
@@ -5032,7 +5059,7 @@ L:        dri-devel@lists.freedesktop.org
 L:     linaro-mm-sig@lists.linaro.org (moderated for non-subscribers)
 F:     drivers/dma-buf/
 F:     include/linux/dma-buf*
-F:     include/linux/reservation.h
+F:     include/linux/dma-resv.h
 F:     include/linux/*fence.h
 F:     Documentation/driver-api/dma-buf.rst
 K:     dma_(buf|fence|resv)
@@ -5212,7 +5239,7 @@ M:        Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 R:     "Rafael J. Wysocki" <rafael@kernel.org>
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git
 S:     Supported
-F:     Documentation/kobject.txt
+F:     Documentation/core-api/kobject.rst
 F:     drivers/base/
 F:     fs/debugfs/
 F:     fs/sysfs/
@@ -5273,6 +5300,12 @@ T:       git git://anongit.freedesktop.org/drm/drm-misc
 S:     Maintained
 F:     drivers/gpu/drm/tve200/
 
+DRM DRIVER FOR FEIXIN K101 IM2BA02 MIPI-DSI LCD PANELS
+M:     Icenowy Zheng <icenowy@aosc.io>
+S:     Maintained
+F:     drivers/gpu/drm/panel/panel-feixin-k101-im2ba02.c
+F:     Documentation/devicetree/bindings/display/panel/feixin,k101-im2ba02.yaml
+
 DRM DRIVER FOR FEIYANG FY07024DI26A30-D MIPI-DSI LCD PANELS
 M:     Jagan Teki <jagan@amarulasolutions.com>
 S:     Maintained
@@ -5292,6 +5325,13 @@ S:       Maintained
 F:     drivers/gpu/drm/tiny/ili9225.c
 F:     Documentation/devicetree/bindings/display/ilitek,ili9225.txt
 
+DRM DRIVER FOR ILITEK ILI9486 PANELS
+M:     Kamlesh Gurudasani <kamlesh.gurudasani@gmail.com>
+T:     git git://anongit.freedesktop.org/drm/drm-misc
+S:     Maintained
+F:     drivers/gpu/drm/tiny/ili9486.c
+F:     Documentation/devicetree/bindings/display/ilitek,ili9486.yaml
+
 DRM DRIVER FOR HX8357D PANELS
 M:     Eric Anholt <eric@anholt.net>
 T:     git git://anongit.freedesktop.org/drm/drm-misc
@@ -5333,6 +5373,13 @@ F:       drivers/gpu/drm/msm/
 F:     include/uapi/drm/msm_drm.h
 F:     Documentation/devicetree/bindings/display/msm/
 
+DRM DRIVER FOR NOVATEK NT35510 PANELS
+M:     Linus Walleij <linus.walleij@linaro.org>
+T:     git git://anongit.freedesktop.org/drm/drm-misc
+S:     Maintained
+F:     drivers/gpu/drm/panel/panel-novatek-nt35510.c
+F:     Documentation/devicetree/bindings/display/panel/novatek,nt35510.yaml
+
 DRM DRIVER FOR NVIDIA GEFORCE/QUADRO GPUS
 M:     Ben Skeggs <bskeggs@redhat.com>
 L:     dri-devel@lists.freedesktop.org
@@ -5420,7 +5467,7 @@ M:        David Lechner <david@lechnology.com>
 T:     git git://anongit.freedesktop.org/drm/drm-misc
 S:     Maintained
 F:     drivers/gpu/drm/tiny/st7735r.c
-F:     Documentation/devicetree/bindings/display/sitronix,st7735r.txt
+F:     Documentation/devicetree/bindings/display/sitronix,st7735r.yaml
 
 DRM DRIVER FOR SONY ACX424AKP PANELS
 M:     Linus Walleij <linus.walleij@linaro.org>
@@ -5500,6 +5547,7 @@ F:        include/linux/vga*
 DRM DRIVERS AND MISC GPU PATCHES
 M:     Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
 M:     Maxime Ripard <mripard@kernel.org>
+M:     Thomas Zimmermann <tzimmermann@suse.de>
 W:     https://01.org/linuxgraphics/gfx-docs/maintainer-tools/drm-misc.html
 S:     Maintained
 T:     git git://anongit.freedesktop.org/drm/drm-misc
@@ -5579,7 +5627,6 @@ S:        Supported
 F:     drivers/gpu/drm/fsl-dcu/
 F:     Documentation/devicetree/bindings/display/fsl,dcu.txt
 F:     Documentation/devicetree/bindings/display/fsl,tcon.txt
-F:     Documentation/devicetree/bindings/display/panel/nec,nl4827hc19-05b.txt
 T:     git git://anongit.freedesktop.org/drm/drm-misc
 
 DRM DRIVERS FOR FREESCALE IMX
@@ -5598,12 +5645,13 @@ S:      Maintained
 F:     drivers/gpu/drm/gma500/
 
 DRM DRIVERS FOR HISILICON
-M:     Xinliang Liu <z.liuxinliang@hisilicon.com>
+M:     Xinliang Liu <xinliang.liu@linaro.org>
 M:     Rongrong Zou <zourongrong@gmail.com>
+R:     John Stultz <john.stultz@linaro.org>
 R:     Xinwei Kong <kong.kongxinwei@hisilicon.com>
 R:     Chen Feng <puck.chen@hisilicon.com>
 L:     dri-devel@lists.freedesktop.org
-T:     git git://github.com/xin3liang/linux.git
+T:     git git://anongit.freedesktop.org/drm/drm-misc
 S:     Maintained
 F:     drivers/gpu/drm/hisilicon/
 F:     Documentation/devicetree/bindings/display/hisilicon/
@@ -5618,7 +5666,7 @@ F:        include/uapi/drm/lima_drm.h
 T:     git git://anongit.freedesktop.org/drm/drm-misc
 
 DRM DRIVERS FOR MEDIATEK
-M:     CK Hu <ck.hu@mediatek.com>
+M:     Chun-Kuang Hu <chunkuang.hu@kernel.org>
 M:     Philipp Zabel <p.zabel@pengutronix.de>
 L:     dri-devel@lists.freedesktop.org
 S:     Supported
@@ -5695,6 +5743,17 @@ S:       Maintained
 F:     drivers/gpu/drm/omapdrm/
 F:     Documentation/devicetree/bindings/display/ti/
 
+DRM DRIVERS FOR TI KEYSTONE
+M:     Jyri Sarha <jsarha@ti.com>
+M:     Tomi Valkeinen <tomi.valkeinen@ti.com>
+L:     dri-devel@lists.freedesktop.org
+S:     Maintained
+F:     drivers/gpu/drm/tidss/
+F:     Documentation/devicetree/bindings/display/ti/ti,k2g-dss.yaml
+F:     Documentation/devicetree/bindings/display/ti/ti,am65x-dss.yaml
+F:     Documentation/devicetree/bindings/display/ti/ti,j721e-dss.yaml
+T:     git git://anongit.freedesktop.org/drm/drm-misc
+
 DRM DRIVERS FOR V3D
 M:     Eric Anholt <eric@anholt.net>
 S:     Supported
@@ -5949,7 +6008,7 @@ W:        http://ecryptfs.org
 W:     https://launchpad.net/ecryptfs
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/tyhicks/ecryptfs.git
 S:     Odd Fixes
-F:     Documentation/filesystems/ecryptfs.txt
+F:     Documentation/filesystems/ecryptfs.rst
 F:     fs/ecryptfs/
 
 EDAC-AMD64
@@ -6009,6 +6068,12 @@ F:       Documentation/driver-api/edac.rst
 F:     drivers/edac/
 F:     include/linux/edac.h
 
+EDAC-DMC520
+M:     Lei Wang <lewan@microsoft.com>
+L:     linux-edac@vger.kernel.org
+S:     Supported
+F:     drivers/edac/dmc520_edac.c
+
 EDAC-E752X
 M:     Mark Gross <mark.gross@intel.com>
 L:     linux-edac@vger.kernel.org
@@ -6259,12 +6324,12 @@ F:      drivers/video/fbdev/s1d13xxxfb.c
 F:     include/video/s1d13xxxfb.h
 
 EROFS FILE SYSTEM
-M:     Gao Xiang <gaoxiang25@huawei.com>
+M:     Gao Xiang <xiang@kernel.org>
 M:     Chao Yu <yuchao0@huawei.com>
 L:     linux-erofs@lists.ozlabs.org
 S:     Maintained
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git
-F:     Documentation/filesystems/erofs.txt
+F:     Documentation/filesystems/erofs.rst
 F:     fs/erofs/
 F:     include/trace/events/erofs.h
 
@@ -6315,17 +6380,11 @@ F:      include/trace/events/mdio.h
 F:     include/uapi/linux/mdio.h
 F:     include/uapi/linux/mii.h
 
-EXFAT FILE SYSTEM
-M:     Valdis Kletnieks <valdis.kletnieks@vt.edu>
-L:     linux-fsdevel@vger.kernel.org
-S:     Maintained
-F:     drivers/staging/exfat/
-
 EXT2 FILE SYSTEM
 M:     Jan Kara <jack@suse.com>
 L:     linux-ext4@vger.kernel.org
 S:     Maintained
-F:     Documentation/filesystems/ext2.txt
+F:     Documentation/filesystems/ext2.rst
 F:     fs/ext2/
 F:     include/linux/ext2*
 
@@ -6353,7 +6412,6 @@ T:        git git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git
 S:     Maintained
 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
 F:     arch/x86/platform/efi/
 F:     drivers/firmware/efi/
@@ -6399,7 +6457,7 @@ L:        linux-f2fs-devel@lists.sourceforge.net
 W:     https://f2fs.wiki.kernel.org/
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs.git
 S:     Maintained
-F:     Documentation/filesystems/f2fs.txt
+F:     Documentation/filesystems/f2fs.rst
 F:     Documentation/ABI/testing/sysfs-fs-f2fs
 F:     fs/f2fs/
 F:     include/linux/f2fs_fs.h
@@ -6869,6 +6927,13 @@ S:       Maintained
 F:     drivers/i2c/busses/i2c-fsi.c
 F:     Documentation/devicetree/bindings/i2c/i2c-fsi.txt
 
+FSI-ATTACHED SPI DRIVER
+M:     Eddie James <eajames@linux.ibm.com>
+L:     linux-spi@vger.kernel.org
+S:     Maintained
+F:     drivers/spi/spi-fsi.c
+F:     Documentation/devicetree/bindings/fsi/ibm,fsi2spi.yaml
+
 FSNOTIFY: FILESYSTEM NOTIFICATION INFRASTRUCTURE
 M:     Jan Kara <jack@suse.cz>
 R:     Amir Goldstein <amir73il@gmail.com>
@@ -6944,7 +7009,7 @@ S:        Maintained
 F:     scripts/gcc-plugins/
 F:     scripts/gcc-plugin.sh
 F:     scripts/Makefile.gcc-plugins
-F:     Documentation/core-api/gcc-plugins.rst
+F:     Documentation/kbuild/gcc-plugins.rst
 
 GASKET DRIVER FRAMEWORK
 M:     Rob Springer <rspringer@google.com>
@@ -7358,8 +7423,8 @@ F:        drivers/media/usb/hackrf/
 HARD DRIVE ACTIVE PROTECTION SYSTEM (HDAPS) DRIVER
 M:     Frank Seidel <frank@f-seidel.de>
 L:     platform-driver-x86@vger.kernel.org
-W:     http://www.kernel.org/pub/linux/kernel/people/fseidel/hdaps/
 S:     Maintained
+W:     http://www.kernel.org/pub/linux/kernel/people/fseidel/hdaps/
 F:     drivers/platform/x86/hdaps.c
 
 HARDWARE MONITORING
@@ -7441,13 +7506,13 @@ F:      drivers/infiniband/hw/hfi1
 HFS FILESYSTEM
 L:     linux-fsdevel@vger.kernel.org
 S:     Orphan
-F:     Documentation/filesystems/hfs.txt
+F:     Documentation/filesystems/hfs.rst
 F:     fs/hfs/
 
 HFSPLUS FILESYSTEM
 L:     linux-fsdevel@vger.kernel.org
 S:     Orphan
-F:     Documentation/filesystems/hfsplus.txt
+F:     Documentation/filesystems/hfsplus.rst
 F:     fs/hfsplus/
 
 HGA FRAMEBUFFER DRIVER
@@ -7962,6 +8027,7 @@ L:        linux-ia64@vger.kernel.org
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux.git
 S:     Maintained
 F:     arch/ia64/
+F:     Documentation/ia64/
 
 IBM Power 842 compression accelerator
 M:     Haren Myneni <haren@us.ibm.com>
@@ -8101,15 +8167,15 @@ F:      drivers/ide/ide-cd*
 IDEAPAD LAPTOP EXTRAS DRIVER
 M:     Ike Panhc <ike.pan@canonical.com>
 L:     platform-driver-x86@vger.kernel.org
-W:     http://launchpad.net/ideapad-laptop
 S:     Maintained
+W:     http://launchpad.net/ideapad-laptop
 F:     drivers/platform/x86/ideapad-laptop.c
 
 IDEAPAD LAPTOP SLIDEBAR DRIVER
 M:     Andrey Moiseev <o2g.org.ru@gmail.com>
 L:     linux-input@vger.kernel.org
-W:     https://github.com/o2genum/ideapad-slidebar
 S:     Maintained
+W:     https://github.com/o2genum/ideapad-slidebar
 F:     drivers/input/misc/ideapad_slidebar.c
 
 IDT VersaClock 5 CLOCK DRIVER
@@ -8325,7 +8391,7 @@ M:        Jan Kara <jack@suse.cz>
 R:     Amir Goldstein <amir73il@gmail.com>
 L:     linux-fsdevel@vger.kernel.org
 S:     Maintained
-F:     Documentation/filesystems/inotify.txt
+F:     Documentation/filesystems/inotify.rst
 F:     fs/notify/inotify/
 F:     include/linux/inotify.h
 F:     include/uapi/linux/inotify.h
@@ -8575,8 +8641,8 @@ F:        samples/mei/*
 INTEL MENLOW THERMAL DRIVER
 M:     Sujith Thomas <sujith.thomas@intel.com>
 L:     platform-driver-x86@vger.kernel.org
-W:     https://01.org/linux-acpi
 S:     Supported
+W:     https://01.org/linux-acpi
 F:     drivers/platform/x86/intel_menlow.c
 
 INTEL MIC DRIVERS (mic)
@@ -8585,15 +8651,15 @@ M:      Ashutosh Dixit <ashutosh.dixit@intel.com>
 S:     Supported
 W:     https://github.com/sudeepdutt/mic
 W:     http://software.intel.com/en-us/mic-developer
+F:     Documentation/misc-devices/mic/
+F:     drivers/dma/mic_x100_dma.c
+F:     drivers/dma/mic_x100_dma.h
+F:     drivers/misc/mic/
 F:     include/linux/mic_bus.h
 F:     include/linux/scif.h
 F:     include/uapi/linux/mic_common.h
 F:     include/uapi/linux/mic_ioctl.h
 F:     include/uapi/linux/scif_ioctl.h
-F:     drivers/misc/mic/
-F:     drivers/dma/mic_x100_dma.c
-F:     drivers/dma/mic_x100_dma.h
-F:     Documentation/mic/
 
 INTEL PMC CORE DRIVER
 M:     Rajneesh Bhardwaj <rajneesh.bhardwaj@intel.com>
@@ -8606,10 +8672,10 @@ INTEL PMC/P-Unit IPC DRIVER
 M:     Zha Qipeng<qipeng.zha@intel.com>
 L:     platform-driver-x86@vger.kernel.org
 S:     Maintained
-F:     drivers/platform/x86/intel_pmc_ipc.c
-F:     drivers/platform/x86/intel_punit_ipc.c
 F:     arch/x86/include/asm/intel_pmc_ipc.h
 F:     arch/x86/include/asm/intel_punit_ipc.h
+F:     drivers/platform/x86/intel_pmc_ipc.c
+F:     drivers/platform/x86/intel_punit_ipc.c
 
 INTEL PMIC GPIO DRIVERS
 M:     Andy Shevchenko <andy@kernel.org>
@@ -8654,8 +8720,8 @@ 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
+F:     tools/power/x86/intel-speed-select/
 
 INTEL STRATIX10 FIRMWARE DRIVERS
 M:     Richard Gong <richard.gong@linux.intel.com>
@@ -9179,7 +9245,7 @@ F:        virt/kvm/*
 F:     tools/kvm/
 F:     tools/testing/selftests/kvm/
 
-KERNEL VIRTUAL MACHINE FOR ARM/ARM64 (KVM/arm, KVM/arm64)
+KERNEL VIRTUAL MACHINE FOR ARM64 (KVM/arm64)
 M:     Marc Zyngier <maz@kernel.org>
 R:     James Morse <james.morse@arm.com>
 R:     Julien Thierry <julien.thierry.kdev@gmail.com>
@@ -9188,9 +9254,6 @@ 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
 S:     Maintained
-F:     arch/arm/include/uapi/asm/kvm*
-F:     arch/arm/include/asm/kvm*
-F:     arch/arm/kvm/
 F:     arch/arm64/include/uapi/asm/kvm*
 F:     arch/arm64/include/asm/kvm*
 F:     arch/arm64/kvm/
@@ -9225,6 +9288,7 @@ L:        kvm@vger.kernel.org
 W:     http://www.ibm.com/developerworks/linux/linux390/
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git
 S:     Supported
+F:     Documentation/virt/kvm/s390*
 F:     arch/s390/include/uapi/asm/kvm*
 F:     arch/s390/include/asm/gmap.h
 F:     arch/s390/include/asm/kvm*
@@ -9291,8 +9355,8 @@ L:        keyrings@vger.kernel.org
 S:     Supported
 F:     Documentation/security/keys/trusted-encrypted.rst
 F:     include/keys/trusted-type.h
-F:     security/keys/trusted.c
-F:     include/keys/trusted.h
+F:     include/keys/trusted_tpm.h
+F:     security/keys/trusted-keys/
 
 KEYS/KEYRINGS
 M:     David Howells <dhowells@redhat.com>
@@ -10035,6 +10099,7 @@ F:      Documentation/devicetree/bindings/phy/phy-mvebu-utmi.txt
 MARVELL CRYPTO DRIVER
 M:     Boris Brezillon <bbrezillon@kernel.org>
 M:     Arnaud Ebalard <arno@natisbad.org>
+M:     Srujana Challa <schalla@marvell.com>
 F:     drivers/crypto/marvell/
 S:     Maintained
 L:     linux-crypto@vger.kernel.org
@@ -10261,6 +10326,13 @@ F:     drivers/net/can/m_can/m_can.c
 F:     drivers/net/can/m_can/m_can.h
 F:     drivers/net/can/m_can/m_can_platform.c
 
+MCP2221A MICROCHIP USB-HID TO I2C BRIDGE DRIVER
+M:     Rishi Gupta <gupt21@gmail.com>
+L:     linux-i2c@vger.kernel.org
+L:     linux-input@vger.kernel.org
+S:     Maintained
+F:     drivers/hid/hid-mcp2221.c
+
 MCP4018 AND MCP4531 MICROCHIP DIGITAL POTENTIOMETER DRIVERS
 M:     Peter Rosin <peda@axentia.se>
 L:     linux-iio@vger.kernel.org
@@ -10970,6 +11042,7 @@ F:      drivers/media/platform/atmel/atmel-isc.h
 F:     drivers/media/platform/atmel/atmel-isc-base.c
 F:     drivers/media/platform/atmel/atmel-isc-regs.h
 F:     Documentation/devicetree/bindings/media/atmel-isc.txt
+F:     include/linux/atmel-isc-media.h
 
 MICROCHIP ISI DRIVER
 M:     Eugen Hristev <eugen.hristev@microchip.com>
@@ -11195,6 +11268,7 @@ S:      Maintained
 F:     arch/mips/loongson64/
 F:     arch/mips/include/asm/mach-loongson64/
 F:     drivers/platform/mips/cpu_hwmon.c
+F:     drivers/irqchip/irq-loongson*
 F:     drivers/*/*loongson3*
 F:     drivers/*/*/*loongson3*
 
@@ -11283,7 +11357,8 @@ F:      drivers/tty/mxser.*
 MONOLITHIC POWER SYSTEM PMIC DRIVER
 M:     Saravanan Sekar <sravanhome@gmail.com>
 S:     Maintained
-F:     Documentation/devicetree/bindings/regulator/mpq7920.yaml
+F:     Documentation/devicetree/bindings/regulator/mps,mp*.yaml
+F:     drivers/regulator/mp5416.c
 F:     drivers/regulator/mpq7920.c
 F:     drivers/regulator/mpq7920.h
 
@@ -11816,7 +11891,7 @@ W:      https://nilfs.sourceforge.io/
 W:     https://nilfs.osdn.jp/
 T:     git git://github.com/konis/nilfs2.git
 S:     Supported
-F:     Documentation/filesystems/nilfs2.txt
+F:     Documentation/filesystems/nilfs2.rst
 F:     fs/nilfs2/
 F:     include/trace/events/nilfs2.h
 F:     include/uapi/linux/nilfs2_api.h
@@ -11886,6 +11961,7 @@ F:      scripts/nsdeps
 F:     Documentation/core-api/symbol-namespaces.rst
 
 NTB AMD DRIVER
+M:     Sanjay R Mehta <sanju.mehta@amd.com>
 M:     Shyam Sundar S K <Shyam-sundar.S-k@amd.com>
 L:     linux-ntb@googlegroups.com
 S:     Supported
@@ -11925,7 +12001,7 @@ L:      linux-ntfs-dev@lists.sourceforge.net
 W:     http://www.tuxera.com/
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/aia21/ntfs.git
 S:     Supported
-F:     Documentation/filesystems/ntfs.txt
+F:     Documentation/filesystems/ntfs.rst
 F:     fs/ntfs/
 
 NUBUS SUBSYSTEM
@@ -12271,7 +12347,7 @@ OMFS FILESYSTEM
 M:     Bob Copeland <me@bobcopeland.com>
 L:     linux-karma-devel@lists.sourceforge.net
 S:     Maintained
-F:     Documentation/filesystems/omfs.txt
+F:     Documentation/filesystems/omfs.rst
 F:     fs/omfs/
 
 OMNIKEY CARDMAN 4000 DRIVER
@@ -12520,8 +12596,8 @@ M:      Joseph Qi <joseph.qi@linux.alibaba.com>
 L:     ocfs2-devel@oss.oracle.com (moderated for non-subscribers)
 W:     http://ocfs2.wiki.kernel.org
 S:     Supported
-F:     Documentation/filesystems/ocfs2.txt
-F:     Documentation/filesystems/dlmfs.txt
+F:     Documentation/filesystems/ocfs2.rst
+F:     Documentation/filesystems/dlmfs.rst
 F:     fs/ocfs2/
 
 ORANGEFS FILESYSTEM
@@ -12531,7 +12607,7 @@ L:      devel@lists.orangefs.org
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/hubcap/linux.git
 S:     Supported
 F:     fs/orangefs/
-F:     Documentation/filesystems/orangefs.txt
+F:     Documentation/filesystems/orangefs.rst
 
 ORINOCO DRIVER
 L:     linux-wireless@vger.kernel.org
@@ -13192,21 +13268,13 @@ K:    \b(clone_args|kernel_clone_args)\b
 PIN CONTROL SUBSYSTEM
 M:     Linus Walleij <linus.walleij@linaro.org>
 L:     linux-gpio@vger.kernel.org
-T:     git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl.git
 S:     Maintained
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl.git
 F:     Documentation/devicetree/bindings/pinctrl/
 F:     Documentation/driver-api/pinctl.rst
 F:     drivers/pinctrl/
 F:     include/linux/pinctrl/
 
-PIN CONTROLLER - MICROCHIP AT91
-M:     Ludovic Desroches <ludovic.desroches@microchip.com>
-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>
 M:     Fabio Estevam <festevam@gmail.com>
@@ -13215,14 +13283,14 @@ M:    Stefan Agner <stefan@agner.ch>
 R:     Pengutronix Kernel Team <kernel@pengutronix.de>
 L:     linux-gpio@vger.kernel.org
 S:     Maintained
-F:     drivers/pinctrl/freescale/
 F:     Documentation/devicetree/bindings/pinctrl/fsl,*
+F:     drivers/pinctrl/freescale/
 
 PIN CONTROLLER - INTEL
 M:     Mika Westerberg <mika.westerberg@linux.intel.com>
 M:     Andy Shevchenko <andy@kernel.org>
-T:     git git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/intel.git
 S:     Maintained
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/intel.git
 F:     drivers/pinctrl/intel/
 
 PIN CONTROLLER - MEDIATEK
@@ -13233,18 +13301,26 @@ F:    Documentation/devicetree/bindings/pinctrl/pinctrl-mt65xx.txt
 F:     Documentation/devicetree/bindings/pinctrl/pinctrl-mt7622.txt
 F:     drivers/pinctrl/mediatek/
 
+PIN CONTROLLER - MICROCHIP AT91
+M:     Ludovic Desroches <ludovic.desroches@microchip.com>
+L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
+L:     linux-gpio@vger.kernel.org
+S:     Supported
+F:     drivers/gpio/gpio-sama5d2-piobu.c
+F:     drivers/pinctrl/pinctrl-at91*
+
 PIN CONTROLLER - QUALCOMM
 M:     Bjorn Andersson <bjorn.andersson@linaro.org>
-S:     Maintained
 L:     linux-arm-msm@vger.kernel.org
+S:     Maintained
 F:     Documentation/devicetree/bindings/pinctrl/qcom,*.txt
 F:     drivers/pinctrl/qcom/
 
 PIN CONTROLLER - RENESAS
 M:     Geert Uytterhoeven <geert+renesas@glider.be>
 L:     linux-renesas-soc@vger.kernel.org
-T:     git git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git sh-pfc
 S:     Maintained
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git sh-pfc
 F:     drivers/pinctrl/pinctrl-rz*
 F:     drivers/pinctrl/sh-pfc/
 
@@ -13254,12 +13330,12 @@ M:    Krzysztof Kozlowski <krzk@kernel.org>
 M:     Sylwester Nawrocki <s.nawrocki@samsung.com>
 L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 L:     linux-samsung-soc@vger.kernel.org (moderated for non-subscribers)
-Q:     https://patchwork.kernel.org/project/linux-samsung-soc/list/
-T:     git git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/samsung.git
 S:     Maintained
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/samsung.git
+Q:     https://patchwork.kernel.org/project/linux-samsung-soc/list/
+F:     Documentation/devicetree/bindings/pinctrl/samsung-pinctrl.txt
 F:     drivers/pinctrl/samsung/
 F:     include/dt-bindings/pinctrl/samsung.h
-F:     Documentation/devicetree/bindings/pinctrl/samsung-pinctrl.txt
 
 PIN CONTROLLER - SINGLE
 M:     Tony Lindgren <tony@atomide.com>
@@ -13272,8 +13348,8 @@ F:      drivers/pinctrl/pinctrl-single.c
 PIN CONTROLLER - ST SPEAR
 M:     Viresh Kumar <vireshk@kernel.org>
 L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
-W:     http://www.st.com/spear
 S:     Maintained
+W:     http://www.st.com/spear
 F:     drivers/pinctrl/spear/
 
 PISTACHIO SOC SUPPORT
@@ -13373,7 +13449,9 @@ F:      Documentation/devicetree/bindings/iio/magnetometer/pni,rm3100.txt
 
 PNP SUPPORT
 M:     "Rafael J. Wysocki" <rafael.j.wysocki@intel.com>
+L:     linux-acpi@vger.kernel.org
 S:     Maintained
+F:     include/linux/pnp.h
 F:     drivers/pnp/
 
 POSIX CLOCKS and TIMERS
@@ -13493,7 +13571,7 @@ S:      Maintained
 F:     fs/proc/
 F:     include/linux/proc_fs.h
 F:     tools/testing/selftests/proc/
-F:     Documentation/filesystems/proc.txt
+F:     Documentation/filesystems/proc.rst
 
 PROC SYSCTL
 M:     Luis Chamberlain <mcgrof@kernel.org>
@@ -13543,6 +13621,12 @@ F:     net/psample
 F:     include/net/psample.h
 F:     include/uapi/linux/psample.h
 
+PRESSURE STALL INFORMATION (PSI)
+M:     Johannes Weiner <hannes@cmpxchg.org>
+S:     Maintained
+F:     kernel/sched/psi.c
+F:     include/linux/psi*
+
 PSTORE FILESYSTEM
 M:     Kees Cook <keescook@chromium.org>
 M:     Anton Vorontsov <anton@enomsg.org>
@@ -13928,6 +14012,7 @@ L:      linux-arm-msm@vger.kernel.org
 T:     git git://linuxtv.org/media_tree.git
 S:     Maintained
 F:     drivers/media/platform/qcom/venus/
+F:     Documentation/devicetree/bindings/media/*venus*
 
 QUALCOMM WCN36XX WIRELESS DRIVER
 M:     Kalle Valo <kvalo@codeaurora.org>
@@ -14103,6 +14188,7 @@ S:      Supported
 F:     arch/x86/kernel/cpu/resctrl/
 F:     arch/x86/include/asm/resctrl_sched.h
 F:     Documentation/x86/resctrl*
+F:     tools/testing/selftests/resctrl/
 
 READ-COPY UPDATE (RCU)
 M:     "Paul E. McKenney" <paulmck@kernel.org>
@@ -14342,9 +14428,12 @@ F:     Documentation/devicetree/bindings/media/rockchip-rga.txt
 
 HANTRO VPU CODEC DRIVER
 M:     Ezequiel Garcia <ezequiel@collabora.com>
+M:     Philipp Zabel <p.zabel@pengutronix.de>
 L:     linux-media@vger.kernel.org
+L:     linux-rockchip@lists.infradead.org
 S:     Maintained
 F:     drivers/staging/media/hantro/
+F:     Documentation/devicetree/bindings/media/nxp,imx8mq-vpu.yaml
 F:     Documentation/devicetree/bindings/media/rockchip-vpu.txt
 
 ROCKER DRIVER
@@ -14391,6 +14480,14 @@ F:     include/net/rose.h
 F:     include/uapi/linux/rose.h
 F:     net/rose/
 
+ROTATION DRIVER FOR ALLWINNER A83T
+M:     Jernej Skrabec <jernej.skrabec@siol.net>
+L:     linux-media@vger.kernel.org
+T:     git git://linuxtv.org/media_tree.git
+S:     Maintained
+F:     drivers/media/platform/sunxi/sun8i-rotate/
+F:     Documentation/devicetree/bindings/media/allwinner,sun8i-a83t-de2-rotate.yaml
+
 RTL2830 MEDIA DRIVER
 M:     Antti Palosaari <crope@iki.fi>
 L:     linux-media@vger.kernel.org
@@ -15004,7 +15101,7 @@ X:      security/selinux/
 
 SELINUX SECURITY MODULE
 M:     Paul Moore <paul@paul-moore.com>
-M:     Stephen Smalley <sds@tycho.nsa.gov>
+M:     Stephen Smalley <stephen.smalley.work@gmail.com>
 M:     Eric Paris <eparis@parisplace.org>
 L:     selinux@vger.kernel.org
 W:     https://selinuxproject.org
@@ -15016,6 +15113,7 @@ F:      security/selinux/
 F:     scripts/selinux/
 F:     Documentation/admin-guide/LSM/SELinux.rst
 F:     Documentation/ABI/obsolete/sysfs-selinux-disable
+F:     Documentation/ABI/obsolete/sysfs-selinux-checkreqprot
 
 SENSABLE PHANTOM
 M:     Jiri Slaby <jirislaby@gmail.com>
@@ -15073,14 +15171,6 @@ M:     Dimitri Sivanich <sivanich@sgi.com>
 S:     Maintained
 F:     drivers/misc/sgi-gru/
 
-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.rst
-F:     drivers/tty/serial/ioc?_serial.c
-F:     include/linux/ioc?.h
-
 SGI XP/XPC/XPNET DRIVER
 M:     Cliff Whickman <cpw@sgi.com>
 M:     Robin Holt <robinmholt@gmail.com>
@@ -15095,6 +15185,14 @@ W:     http://www.ibm.com/developerworks/linux/linux390/
 S:     Supported
 F:     net/smc/
 
+SHARP GP2AP002A00F/GP2AP002S00F SENSOR DRIVER
+M:     Linus Walleij <linus.walleij@linaro.org>
+L:     linux-iio@vger.kernel.org
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git
+S:     Maintained
+F:     drivers/iio/light/gp2ap002.c
+F:     Documentation/devicetree/bindings/iio/light/sharp,gp2ap002.yaml
+
 SHARP RJ54N1CB0C SENSOR DRIVER
 M:     Jacopo Mondi <jacopo@jmondi.org>
 L:     linux-media@vger.kernel.org
@@ -15361,11 +15459,10 @@ S:    Odd Fixes
 F:     drivers/net/ethernet/smsc/smc91x.*
 
 SMIA AND SMIA++ IMAGE SENSOR DRIVER
-M:     Sakari Ailus <sakari.ailus@iki.fi>
+M:     Sakari Ailus <sakari.ailus@linux.intel.com>
 L:     linux-media@vger.kernel.org
 S:     Maintained
 F:     drivers/media/i2c/smiapp/
-F:     include/media/i2c/smiapp.h
 F:     drivers/media/i2c/smiapp-pll.c
 F:     drivers/media/i2c/smiapp-pll.h
 F:     include/uapi/linux/smiapp.h
@@ -15544,6 +15641,14 @@ S:     Maintained
 F:     drivers/media/i2c/imx214.c
 F:     Documentation/devicetree/bindings/media/i2c/sony,imx214.txt
 
+SONY IMX219 SENSOR DRIVER
+M:     Dave Stevenson <dave.stevenson@raspberrypi.com>
+L:     linux-media@vger.kernel.org
+T:     git git://linuxtv.org/media_tree.git
+S:     Maintained
+F:     drivers/media/i2c/imx219.c
+F:     Documentation/devicetree/bindings/media/i2c/imx219.yaml
+
 SONY IMX258 SENSOR DRIVER
 M:     Sakari Ailus <sakari.ailus@linux.intel.com>
 L:     linux-media@vger.kernel.org
@@ -15594,8 +15699,8 @@ F:      include/linux/memstick.h
 SONY VAIO CONTROL DEVICE DRIVER
 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
+W:     http://www.linux.it/~malattia/wiki/index.php/Sony_drivers
 F:     Documentation/admin-guide/laptops/sony-laptop.rst
 F:     drivers/char/sonypi.c
 F:     drivers/platform/x86/sony-laptop.c
@@ -15766,7 +15871,7 @@ L:      squashfs-devel@lists.sourceforge.net (subscribers-only)
 W:     http://squashfs.org.uk
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/pkl/squashfs-next.git
 S:     Maintained
-F:     Documentation/filesystems/squashfs.txt
+F:     Documentation/filesystems/squashfs.rst
 F:     fs/squashfs/
 
 SRM (Alpha) environment access
@@ -16218,7 +16323,7 @@ F:      drivers/platform/x86/system76_acpi.c
 SYSV FILESYSTEM
 M:     Christoph Hellwig <hch@infradead.org>
 S:     Maintained
-F:     Documentation/filesystems/sysv-fs.txt
+F:     Documentation/filesystems/sysv-fs.rst
 F:     fs/sysv/
 F:     include/linux/sysv_fs.h
 
@@ -16577,10 +16682,10 @@ THINKPAD ACPI EXTRAS DRIVER
 M:     Henrique de Moraes Holschuh <ibm-acpi@hmh.eng.br>
 L:     ibm-acpi-devel@lists.sourceforge.net
 L:     platform-driver-x86@vger.kernel.org
+S:     Maintained
 W:     http://ibm-acpi.sourceforge.net
 W:     http://thinkwiki.org/wiki/Ibm-acpi
 T:     git git://repo.or.cz/linux-2.6/linux-acpi-2.6/ibm-acpi-2.6.git
-S:     Maintained
 F:     drivers/platform/x86/thinkpad_acpi.c
 
 THUNDERBOLT DRIVER
@@ -16784,12 +16889,12 @@ F:    sound/soc/codecs/twl4030*
 TI VPE/CAL DRIVERS
 M:     Benoit Parrot <bparrot@ti.com>
 L:     linux-media@vger.kernel.org
+S:     Maintained
 W:     http://linuxtv.org/
 Q:     http://patchwork.linuxtv.org/project/linux-media/list/
-S:     Maintained
-F:     drivers/media/platform/ti-vpe/
-F:     Documentation/devicetree/bindings/media/ti,vpe.yaml
 F:     Documentation/devicetree/bindings/media/ti,cal.yaml
+F:     Documentation/devicetree/bindings/media/ti,vpe.yaml
+F:     drivers/media/platform/ti-vpe/
 
 TI WILINK WIRELESS DRIVERS
 L:     linux-wireless@vger.kernel.org
@@ -17076,6 +17181,18 @@ W:     http://linuxtv.org
 S:     Maintained
 F:     drivers/media/pci/tw686x/
 
+UACCE ACCELERATOR FRAMEWORK
+M:     Zhangfei Gao <zhangfei.gao@linaro.org>
+M:     Zhou Wang <wangzhou1@hisilicon.com>
+L:     linux-accelerators@lists.ozlabs.org
+L:     linux-kernel@vger.kernel.org
+S:     Maintained
+F:     Documentation/ABI/testing/sysfs-driver-uacce
+F:     Documentation/misc-devices/uacce.rst
+F:     drivers/misc/uacce/
+F:     include/linux/uacce.h
+F:     include/uapi/misc/uacce/
+
 UBI FILE SYSTEM (UBIFS)
 M:     Richard Weinberger <richard@nod.at>
 L:     linux-mtd@lists.infradead.org
@@ -17083,7 +17200,7 @@ T:      git git://git.kernel.org/pub/scm/linux/kernel/git/rw/ubifs.git next
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/rw/ubifs.git fixes
 W:     http://www.linux-mtd.infradead.org/doc/ubifs.html
 S:     Supported
-F:     Documentation/filesystems/ubifs.txt
+F:     Documentation/filesystems/ubifs.rst
 F:     fs/ubifs/
 
 UCLINUX (M68KNOMMU AND COLDFIRE)
@@ -17102,7 +17219,7 @@ F:      arch/m68k/include/asm/*_no.*
 UDF FILESYSTEM
 M:     Jan Kara <jack@suse.com>
 S:     Maintained
-F:     Documentation/filesystems/udf.txt
+F:     Documentation/filesystems/udf.rst
 F:     fs/udf/
 
 UDRAW TABLET
@@ -17131,11 +17248,6 @@ S:     Maintained
 F:     drivers/usb/common/ulpi.c
 F:     include/linux/ulpi/
 
-ULTRA-WIDEBAND (UWB) SUBSYSTEM
-L:     devel@driverdev.osuosl.org
-S:     Obsolete
-F:     drivers/staging/uwb/
-
 UNICODE SUBSYSTEM
 M:     Gabriel Krisman Bertazi <krisman@collabora.com>
 L:     linux-fsdevel@vger.kernel.org
@@ -17219,6 +17331,12 @@ S:     Maintained
 F:     Documentation/usb/acm.rst
 F:     drivers/usb/class/cdc-acm.*
 
+USB APPLE MFI FASTCHARGE DRIVER
+M:     Bastien Nocera <hadess@hadess.net>
+L:     linux-usb@vger.kernel.org
+S:     Maintained
+F:     drivers/usb/misc/apple-mfi-fastcharge.c
+
 USB AR5523 WIRELESS DRIVER
 M:     Pontus Fuchs <pontus.fuchs@gmail.com>
 L:     linux-wireless@vger.kernel.org
@@ -17481,7 +17599,7 @@ L:      linux-media@vger.kernel.org
 T:     git git://linuxtv.org/media_tree.git
 W:     https://linuxtv.org
 S:     Odd Fixes
-F:     drivers/media/usb/usbvision/
+F:     drivers/staging/media/usbvision/
 
 USB WEBCAM GADGET
 M:     Laurent Pinchart <laurent.pinchart@ideasonboard.com>
@@ -18231,10 +18349,10 @@ X86 PLATFORM DRIVERS
 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:     Odd Fixes
-F:     drivers/platform/x86/
+T:     git git://git.infradead.org/linux-platform-drivers-x86.git
 F:     drivers/platform/olpc/
+F:     drivers/platform/x86/
 
 X86 PLATFORM DRIVERS - ARCH
 R:     Darren Hart <dvhart@infradead.org>
@@ -18548,7 +18666,7 @@ L:      linux-fsdevel@vger.kernel.org
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/zonefs.git
 S:     Maintained
 F:     fs/zonefs/
-F:     Documentation/filesystems/zonefs.txt
+F:     Documentation/filesystems/zonefs.rst
 
 ZPOOL COMPRESSED PAGE STORAGE API
 M:     Dan Streetman <ddstreet@ieee.org>