Merge tag 'erofs-for-5.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/xiang...

Pull erofs updates from Gao Xiang:
 "Updates with a XArray adaptation, several fixes for shrinker and
  corrupted images are ready for this cycle.

  All commits have been stress tested with no noticeable smoke out and
  have been in linux-next as well.

  Summary:

   - Convert radix tree usage to XArray

   - Fix shrink scan count on multiple filesystem instances

   - Better handling for specific corrupted images

   - Update my email address in MAINTAINERS"

* tag 'erofs-for-5.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs:
  MAINTAINERS: erofs: update my email address
  erofs: handle corrupted images whose decompressed size less than it'd be
  erofs: use LZ4_decompress_safe() for full decoding
  erofs: correct the remaining shrink objects
  erofs: convert workstn to XArray

diff --combined MAINTAINERS
index 953478c,07ff1d1..bbec693
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -214,7 -214,7 +214,7 @@@ Q: http://patchwork.kernel.org/project/
  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/
@@@ -584,7 -584,7 +584,7 @@@ AFFS FILE SYSTE
  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 +593,7 @@@ L: linux-afs@lists.infradead.or
  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
@@@ -693,7 -693,7 +693,7 @@@ ALLWINNER CPUFREQ DRIVE
  M:    Yangtao Li <tiny.windzz@gmail.com>
  L:    linux-pm@vger.kernel.org
  S:    Maintained
 -F:    Documentation/devicetree/bindings/opp/sun50i-nvmem-cpufreq.txt
 +F:    Documentation/devicetree/bindings/opp/allwinner,sun50i-h6-operating-points.yaml
  F:    drivers/cpufreq/sun50i-cpufreq-nvmem.c
  
  ALLWINNER CRYPTO DRIVERS
@@@ -3063,7 -3063,7 +3063,7 @@@ M:      Luis de Bethencourt <luisbg@kernel.o
  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 -3077,7 +3077,7 @@@ F:      Documentation/block/bfq-iosched.rs
  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
  
@@@ -3610,7 -3610,7 +3610,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*
@@@ -3907,7 -3907,7 +3907,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
@@@ -4017,7 -4017,7 +4017,7 @@@ M:      Cheng-Yi Chiang <cychiang@chromium.o
  S:    Maintained
  R:    Enric Balletbo i Serra <enric.balletbo@collabora.com>
  R:    Guenter Roeck <groeck@chromium.org>
 -F:    Documentation/devicetree/bindings/sound/google,cros-ec-codec.txt
 +F:    Documentation/devicetree/bindings/sound/google,cros-ec-codec.yaml
  F:    sound/soc/codecs/cros_ec_codec.*
  
  CIRRUS LOGIC AUDIO CODEC DRIVERS
@@@ -4073,6 -4073,7 +4073,6 @@@ F:      drivers/scsi/snic
  CISCO VIC ETHERNET NIC DRIVER
  M:    Christian Benvenuti <benve@cisco.com>
  M:    Govindarajulu Varadarajan <_govind@gmx.com>
 -M:    Parvi Kaustubhi <pkaustub@cisco.com>
  S:    Supported
  F:    drivers/net/ethernet/cisco/enic/
  
@@@ -4423,7 -4424,7 +4423,7 @@@ F:      include/linux/cpuidle.
  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
@@@ -4474,7 -4475,7 +4474,7 @@@ L:      linux-media@vger.kernel.or
  T:    git git://linuxtv.org/media_tree.git
  S:    Maintained
  F:    drivers/media/platform/sunxi/sun6i-csi/
 -F:    Documentation/devicetree/bindings/media/sun6i-csi.txt
 +F:    Documentation/devicetree/bindings/media/allwinner,sun6i-a31-csi.yaml
  
  CW1200 WLAN driver
  M:    Solomon Peachy <pizza@shaftnet.org>
@@@ -4571,7 -4572,7 +4571,7 @@@ F:      drivers/infiniband/hw/cxgb4
  F:    include/uapi/rdma/cxgb4-abi.h
  
  CXGB4VF ETHERNET DRIVER (CXGB4VF)
 -M:    Casey Leedom <leedom@chelsio.com>
 +M:    Vishal Kulkarni <vishal@gmail.com>
  L:    netdev@vger.kernel.org
  W:    http://www.chelsio.com
  S:    Supported
@@@ -5201,7 -5202,7 +5201,7 @@@ M:      Greg Kroah-Hartman <gregkh@linuxfoun
  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/
@@@ -5667,7 -5668,7 +5667,7 @@@ L:      dri-devel@lists.freedesktop.or
  T:    git git://anongit.freedesktop.org/drm/drm-misc
  S:    Maintained
  F:    drivers/gpu/drm/stm
 -F:    Documentation/devicetree/bindings/display/st,stm32-ltdc.txt
 +F:    Documentation/devicetree/bindings/display/st,stm32-ltdc.yaml
  
  DRM DRIVERS FOR TI LCDC
  M:    Jyri Sarha <jsarha@ti.com>
@@@ -5938,7 -5939,7 +5938,7 @@@ W:      http://ecryptfs.or
  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
@@@ -6197,6 -6198,7 +6197,6 @@@ S:      Supporte
  F:    drivers/scsi/be2iscsi/
  
  Emulex 10Gbps NIC BE2, BE3-R, Lancer, Skyhawk-R DRIVER (be2net)
 -M:    Sathya Perla <sathya.perla@broadcom.com>
  M:    Ajit Khaparde <ajit.khaparde@broadcom.com>
  M:    Sriharsha Basavapatna <sriharsha.basavapatna@broadcom.com>
  M:    Somnath Kotur <somnath.kotur@broadcom.com>
@@@ -6248,12 -6250,12 +6248,12 @@@ F:   drivers/video/fbdev/s1d13xxxfb.
  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
  
@@@ -6314,7 -6316,7 +6314,7 @@@ EXT2 FILE SYSTE
  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*
  
@@@ -6388,7 -6390,7 +6388,7 @@@ L:      linux-f2fs-devel@lists.sourceforge.n
  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
@@@ -6933,7 -6935,7 +6933,7 @@@ S:      Maintaine
  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>
@@@ -7430,13 -7432,13 +7430,13 @@@ F:   drivers/infiniband/hw/hfi
  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
@@@ -7516,12 -7518,6 +7516,12 @@@ F:    include/uapi/linux/if_hippi.
  F:    net/802/hippi.c
  F:    drivers/net/hippi/
  
 +HISILICON DMA DRIVER
 +M:    Zhou Wang <wangzhou1@hisilicon.com>
 +L:    dmaengine@vger.kernel.org
 +S:    Maintained
 +F:    drivers/dma/hisi_dma.c
 +
  HISILICON SECURITY ENGINE V2 DRIVER (SEC2)
  M:    Zaibo Xu <xuzaibo@huawei.com>
  L:    linux-crypto@vger.kernel.org
@@@ -7579,8 -7575,7 +7579,8 @@@ F:      Documentation/admin-guide/perf/hisi-
  
  HISILICON ROCE DRIVER
  M:    Lijun Ou <oulijun@huawei.com>
 -M:    Wei Hu(Xavier) <xavier.huwei@huawei.com>
 +M:    Wei Hu(Xavier) <huwei87@hisilicon.com>
 +M:    Weihang Li <liweihang@huawei.com>
  L:    linux-rdma@vger.kernel.org
  S:    Maintained
  F:    drivers/infiniband/hw/hns/
@@@ -7743,7 -7738,7 +7743,7 @@@ Hyper-V CORE AND DRIVER
  M:    "K. Y. Srinivasan" <kys@microsoft.com>
  M:    Haiyang Zhang <haiyangz@microsoft.com>
  M:    Stephen Hemminger <sthemmin@microsoft.com>
 -M:    Sasha Levin <sashal@kernel.org>
 +M:    Wei Liu <wei.liu@kernel.org>
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git
  L:    linux-hyperv@vger.kernel.org
  S:    Supported
@@@ -8314,7 -8309,7 +8314,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
@@@ -8483,6 -8478,7 +8483,6 @@@ L:      dmaengine@vger.kernel.or
  S:    Supported
  F:    drivers/dma/idxd/*
  F:    include/uapi/linux/idxd.h
 -F:    include/linux/idxd.h
  
  INTEL IDLE DRIVER
  M:    Jacob Pan <jacob.jun.pan@linux.intel.com>
@@@ -8574,15 -8570,15 +8574,15 @@@ M:   Ashutosh Dixit <ashutosh.dixit@intel
  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>
@@@ -8689,7 -8685,7 +8689,7 @@@ M:      Emmanuel Grumbach <emmanuel.grumbach
  M:    Luca Coelho <luciano.coelho@intel.com>
  M:    Intel Linux Wireless <linuxwifi@intel.com>
  L:    linux-wireless@vger.kernel.org
 -W:    http://intellinuxwireless.org
 +W:    https://wireless.wiki.kernel.org/en/users/drivers/iwlwifi
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi.git
  S:    Supported
  F:    drivers/net/wireless/intel/iwlwifi/
@@@ -9280,8 -9276,8 +9280,8 @@@ L:      keyrings@vger.kernel.or
  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>
@@@ -10168,7 -10164,7 +10168,7 @@@ MAXBOTIX ULTRASONIC RANGER IIO DRIVE
  M:    Andreas Klinger <ak@it-klinger.de>
  L:    linux-iio@vger.kernel.org
  S:    Maintained
 -F:    Documentation/devicetree/bindings/iio/proximity/maxbotix,mb1232.txt
 +F:    Documentation/devicetree/bindings/iio/proximity/maxbotix,mb1232.yaml
  F:    drivers/iio/proximity/mb1232.c
  
  MAXIM MAX77650 PMIC MFD DRIVER
@@@ -10471,7 -10467,7 +10471,7 @@@ M:   Hugues Fruchet <hugues.fruchet@st.co
  L:    linux-media@vger.kernel.org
  T:    git git://linuxtv.org/media_tree.git
  S:    Supported
 -F:    Documentation/devicetree/bindings/media/st,stm32-dcmi.txt
 +F:    Documentation/devicetree/bindings/media/st,stm32-dcmi.yaml
  F:    drivers/media/platform/stm32/stm32-dcmi.c
  
  MEDIA DRIVERS FOR NVIDIA TEGRA - VDE
@@@ -11123,7 -11119,7 +11123,7 @@@ M:   Thomas Bogendoerfer <tsbogend@alpha.
  L:    linux-mips@vger.kernel.org
  W:    http://www.linux-mips.org/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git
 -Q:    http://patchwork.linux-mips.org/project/linux-mips/list/
 +Q:    https://patchwork.kernel.org/project/linux-mips/list/
  S:    Maintained
  F:    Documentation/devicetree/bindings/mips/
  F:    Documentation/mips/
@@@ -11794,7 -11790,7 +11794,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
@@@ -11903,7 -11899,7 +11903,7 @@@ L:   linux-ntfs-dev@lists.sourceforge.ne
  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
@@@ -12249,7 -12245,7 +12249,7 @@@ OMFS FILESYSTE
  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
@@@ -12498,8 -12494,8 +12498,8 @@@ M:   Joseph Qi <joseph.qi@linux.alibaba.c
  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
@@@ -12509,7 -12505,7 +12509,7 @@@ L:   devel@lists.orangefs.or
  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
@@@ -12956,6 -12952,7 +12956,6 @@@ M:   Robert Richter <rrichter@marvell.com
  L:    linux-pci@vger.kernel.org
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Supported
 -F:    Documentation/devicetree/bindings/pci/pci-thunder-*
  F:    drivers/pci/controller/pci-thunder-*
  
  PCIE DRIVER FOR HISILICON
@@@ -13471,7 -13468,7 +13471,7 @@@ S:   Maintaine
  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>
@@@ -14230,7 -14227,7 +14230,7 @@@ F:   include/dt-bindings/reset
  F:    include/linux/reset.h
  F:    include/linux/reset/
  F:    include/linux/reset-controller.h
 -K:      \b(?:devm_|of_)?reset_control(?:ler_[a-z]+|_[a-z_]+)?\b
 +K:    \b(?:devm_|of_)?reset_control(?:ler_[a-z]+|_[a-z_]+)?\b
  
  RESTARTABLE SEQUENCES SUPPORT
  M:    Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
@@@ -15422,9 -15419,11 +15422,9 @@@ F:  drivers/infiniband/sw/siw
  F:    include/uapi/rdma/siw-abi.h
  
  SOFT-ROCE DRIVER (rxe)
 -M:    Moni Shoua <monis@mellanox.com>
 +M:    Zhu Yanjun <yanjunz@mellanox.com>
  L:    linux-rdma@vger.kernel.org
  S:    Supported
 -W:    https://github.com/SoftRoCE/rxe-dev/wiki/rxe-dev:-Home
 -Q:    http://patchwork.kernel.org/project/linux-rdma/list/
  F:    drivers/infiniband/sw/rxe/
  F:    include/uapi/rdma/rdma_user_rxe.h
  
@@@ -15738,7 -15737,7 +15738,7 @@@ L:   squashfs-devel@lists.sourceforge.ne
  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
@@@ -15923,7 -15922,7 +15923,7 @@@ F:   drivers/*/stm32-*timer
  F:    drivers/pwm/pwm-stm32*
  F:    include/linux/*/stm32-*tim*
  F:    Documentation/ABI/testing/*timer-stm32
 -F:    Documentation/devicetree/bindings/*/stm32-*timer*
 +F:    Documentation/devicetree/bindings/*/*stm32-*timer*
  F:    Documentation/devicetree/bindings/pwm/pwm-stm32*
  
  STMMAC ETHERNET DRIVER
@@@ -16082,8 -16081,6 +16082,8 @@@ SYNOPSYS DESIGNWARE 8250 UART DRIVE
  R:    Andy Shevchenko <andriy.shevchenko@linux.intel.com>
  S:    Maintained
  F:    drivers/tty/serial/8250/8250_dw.c
 +F:    drivers/tty/serial/8250/8250_dwlib.*
 +F:    drivers/tty/serial/8250/8250_lpss.c
  
  SYNOPSYS DESIGNWARE APB GPIO DRIVER
  M:    Hoan Tran <hoan@os.amperecomputing.com>
@@@ -16183,7 -16180,7 +16183,7 @@@ F:   drivers/platform/x86/system76_acpi.
  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
  
@@@ -16754,7 -16751,7 +16754,7 @@@ Q:   http://patchwork.linuxtv.org/project
  S:    Maintained
  F:    drivers/media/platform/ti-vpe/
  F:    Documentation/devicetree/bindings/media/ti,vpe.yaml
 -      Documentation/devicetree/bindings/media/ti,cal.yaml
 +F:    Documentation/devicetree/bindings/media/ti,cal.yaml
  
  TI WILINK WIRELESS DRIVERS
  L:    linux-wireless@vger.kernel.org
@@@ -17048,7 -17045,7 +17048,7 @@@ T:   git git://git.kernel.org/pub/scm/lin
  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)
@@@ -17067,7 -17064,7 +17067,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
@@@ -18506,7 -18503,7 +18506,7 @@@ L:   linux-fsdevel@vger.kernel.or
  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>