fs/seq_file.c: seq_read: Update pr_info_ratelimited
[linux-2.6-microblaze.git] / MAINTAINERS
index 92ce8d2..ddc1dc7 100644 (file)
@@ -147,7 +147,7 @@ Maintainers List
 M:     Steffen Klassert <klassert@kernel.org>
 L:     netdev@vger.kernel.org
 S:     Odd Fixes
-F:     Documentation/networking/device_drivers/3com/vortex.txt
+F:     Documentation/networking/device_drivers/3com/vortex.rst
 F:     drivers/net/ethernet/3com/3c59x.c
 
 3CR990 NETWORK DRIVER
@@ -193,7 +193,7 @@ W:  https://wireless.wiki.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
 F:     Documentation/driver-api/80211/cfg80211.rst
-F:     Documentation/networking/regulatory.txt
+F:     Documentation/networking/regulatory.rst
 F:     include/linux/ieee80211.h
 F:     include/net/cfg80211.h
 F:     include/net/ieee80211_radiotap.h
@@ -815,7 +815,7 @@ R:  Saeed Bishara <saeedb@amazon.com>
 R:     Zorik Machulsky <zorik@amazon.com>
 L:     netdev@vger.kernel.org
 S:     Supported
-F:     Documentation/networking/device_drivers/amazon/ena.txt
+F:     Documentation/networking/device_drivers/amazon/ena.rst
 F:     drivers/net/ethernet/amazon/
 
 AMAZON RDMA EFA DRIVER
@@ -1286,7 +1286,7 @@ L:        netdev@vger.kernel.org
 S:     Supported
 W:     https://www.marvell.com/
 Q:     http://patchwork.ozlabs.org/project/netdev/list/
-F:     Documentation/networking/device_drivers/aquantia/atlantic.txt
+F:     Documentation/networking/device_drivers/aquantia/atlantic.rst
 F:     drivers/net/ethernet/aquantia/atlantic/
 
 AQUANTIA ETHERNET DRIVER PTP SUBSYSTEM
@@ -2237,6 +2237,7 @@ F:        drivers/*/qcom*
 F:     drivers/*/qcom/
 F:     drivers/bluetooth/btqcomsmd.c
 F:     drivers/clocksource/timer-qcom.c
+F:     drivers/cpuidle/cpuidle-qcom-spm.c
 F:     drivers/extcon/extcon-qcom*
 F:     drivers/i2c/busses/i2c-qcom-geni.c
 F:     drivers/i2c/busses/i2c-qup.c
@@ -3203,7 +3204,7 @@ Q:        https://patchwork.ozlabs.org/project/netdev/list/?delegate=77147
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf.git
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next.git
 F:     Documentation/bpf/
-F:     Documentation/networking/filter.txt
+F:     Documentation/networking/filter.rst
 F:     arch/*/net/*
 F:     include/linux/bpf*
 F:     include/linux/filter.h
@@ -3681,7 +3682,7 @@ L:        linux-media@vger.kernel.org
 S:     Odd fixes
 W:     https://linuxtv.org
 T:     git git://linuxtv.org/media_tree.git
-F:     Documentation/media/v4l-drivers/bttv*
+F:     Documentation/driver-api/media/drivers/bttv*
 F:     drivers/media/pci/bt8xx/bttv*
 
 BUS FREQUENCY DRIVER FOR SAMSUNG EXYNOS
@@ -3742,7 +3743,7 @@ CACHEFILES: FS-CACHE BACKEND FOR CACHING ON MOUNTED FILESYSTEMS
 M:     David Howells <dhowells@redhat.com>
 L:     linux-cachefs@redhat.com (moderated for non-subscribers)
 S:     Supported
-F:     Documentation/filesystems/caching/cachefiles.txt
+F:     Documentation/filesystems/caching/cachefiles.rst
 F:     fs/cachefiles/
 
 CADENCE MIPI-CSI2 BRIDGES
@@ -3772,7 +3773,7 @@ M:        Jonathan Corbet <corbet@lwn.net>
 L:     linux-media@vger.kernel.org
 S:     Maintained
 T:     git git://linuxtv.org/media_tree.git
-F:     Documentation/media/v4l-drivers/cafe_ccic*
+F:     Documentation/admin-guide/media/cafe_ccic*
 F:     drivers/media/platform/marvell-ccic/
 
 CAIF NETWORK LAYER
@@ -3925,8 +3926,8 @@ W:        http://linuxtv.org
 T:     git git://linuxtv.org/media_tree.git
 F:     Documentation/ABI/testing/debugfs-cec-error-inj
 F:     Documentation/devicetree/bindings/media/cec.txt
-F:     Documentation/media/kapi/cec-core.rst
-F:     Documentation/media/uapi/cec
+F:     Documentation/driver-api/media/cec-core.rst
+F:     Documentation/userspace-api/media/cec
 F:     drivers/media/cec/
 F:     drivers/media/rc/keymaps/rc-cec.c
 F:     include/media/cec-notifier.h
@@ -4219,7 +4220,7 @@ M:        coda@cs.cmu.edu
 L:     codalist@coda.cs.cmu.edu
 S:     Maintained
 W:     http://www.coda.cs.cmu.edu/
-F:     Documentation/filesystems/coda.txt
+F:     Documentation/filesystems/coda.rst
 F:     fs/coda/
 F:     include/linux/coda*.h
 F:     include/uapi/linux/coda*.h
@@ -4558,7 +4559,7 @@ L:        linux-media@vger.kernel.org
 S:     Odd fixes
 W:     https://linuxtv.org
 T:     git git://linuxtv.org/media_tree.git
-F:     Documentation/media/v4l-drivers/cx88*
+F:     Documentation/driver-api/media/drivers/cx88*
 F:     drivers/media/pci/cx88/
 
 CXD2820R MEDIA DRIVER
@@ -4710,7 +4711,7 @@ F:        net/ax25/sysctl_net_ax25.c
 DAVICOM FAST ETHERNET (DMFE) NETWORK DRIVER
 L:     netdev@vger.kernel.org
 S:     Orphan
-F:     Documentation/networking/device_drivers/dec/dmfe.txt
+F:     Documentation/networking/device_drivers/dec/dmfe.rst
 F:     drivers/net/ethernet/dec/tulip/dmfe.c
 
 DC390/AM53C974 SCSI driver
@@ -4744,7 +4745,7 @@ DECnet NETWORK LAYER
 L:     linux-decnet-user@lists.sourceforge.net
 S:     Orphan
 W:     http://linux-decnet.sourceforge.net
-F:     Documentation/networking/decnet.txt
+F:     Documentation/networking/decnet.rst
 F:     net/decnet/
 
 DECSTATION PLATFORM SUPPORT
@@ -5012,7 +5013,7 @@ M:        Jan Kara <jack@suse.cz>
 R:     Amir Goldstein <amir73il@gmail.com>
 L:     linux-fsdevel@vger.kernel.org
 S:     Maintained
-F:     Documentation/filesystems/dnotify.txt
+F:     Documentation/filesystems/dnotify.rst
 F:     fs/notify/dnotify/
 F:     include/linux/dnotify.h
 
@@ -5026,7 +5027,7 @@ W:        http://www.win.tue.nl/~aeb/partitions/partition_types-1.html
 DISKQUOTA
 M:     Jan Kara <jack@suse.com>
 S:     Maintained
-F:     Documentation/filesystems/quota.txt
+F:     Documentation/filesystems/quota.rst
 F:     fs/quota/
 F:     include/linux/quota*.h
 F:     include/uapi/linux/quota*.h
@@ -5061,7 +5062,7 @@ F:        drivers/dma-buf/
 F:     include/linux/*fence.h
 F:     include/linux/dma-buf*
 F:     include/linux/dma-resv.h
-K:     dma_(buf|fence|resv)
+K:     \bdma_(?:buf|fence|resv)\b
 
 DMA GENERIC OFFLOAD ENGINE SUBSYSTEM
 M:     Vinod Koul <vkoul@kernel.org>
@@ -5141,12 +5142,14 @@ F:      scripts/documentation-file-ref-check
 F:     scripts/kernel-doc
 F:     scripts/sphinx-pre-install
 X:     Documentation/ABI/
+X:     Documentation/admin-guide/media/
 X:     Documentation/devicetree/
+X:     Documentation/driver-api/media/
 X:     Documentation/firmware-guide/acpi/
 X:     Documentation/i2c/
-X:     Documentation/media/
 X:     Documentation/power/
 X:     Documentation/spi/
+X:     Documentation/userspace-api/media/
 
 DOCUMENTATION SCRIPTS
 M:     Mauro Carvalho Chehab <mchehab@kernel.org>
@@ -5273,7 +5276,7 @@ DRM DRIVER FOR ARM VERSATILE TFT PANELS
 M:     Linus Walleij <linus.walleij@linaro.org>
 S:     Maintained
 T:     git git://anongit.freedesktop.org/drm/drm-misc
-F:     Documentation/devicetree/bindings/display/panel/arm,versatile-tft-panel.txt
+F:     Documentation/devicetree/bindings/display/panel/arm,versatile-tft-panel.yaml
 F:     drivers/gpu/drm/panel/panel-arm-versatile.c
 
 DRM DRIVER FOR ASPEED BMC GFX
@@ -5299,7 +5302,7 @@ F:        drivers/gpu/drm/bochs/
 DRM DRIVER FOR BOE HIMAX8279D PANELS
 M:     Jerry Han <hanxu5@huaqin.corp-partner.google.com>
 S:     Maintained
-F:     Documentation/devicetree/bindings/display/panel/boe,himax8279d.txt
+F:     Documentation/devicetree/bindings/display/panel/boe,himax8279d.yaml
 F:     drivers/gpu/drm/panel/panel-boe-himax8279d.c
 
 DRM DRIVER FOR FARADAY TVE200 TV ENCODER
@@ -5317,7 +5320,7 @@ F:        drivers/gpu/drm/panel/panel-feixin-k101-im2ba02.c
 DRM DRIVER FOR FEIYANG FY07024DI26A30-D MIPI-DSI LCD PANELS
 M:     Jagan Teki <jagan@amarulasolutions.com>
 S:     Maintained
-F:     Documentation/devicetree/bindings/display/panel/feiyang,fy07024di26a30d.txt
+F:     Documentation/devicetree/bindings/display/panel/feiyang,fy07024di26a30d.yaml
 F:     drivers/gpu/drm/panel/panel-feiyang-fy07024di26a30d.c
 
 DRM DRIVER FOR GRAIN MEDIA GM12U320 PROJECTORS
@@ -5352,6 +5355,14 @@ S:       Orphan / Obsolete
 F:     drivers/gpu/drm/i810/
 F:     include/uapi/drm/i810_drm.h
 
+DRM DRIVER FOR LVDS PANELS
+M:     Laurent Pinchart <laurent.pinchart@ideasonboard.com>
+L:     dri-devel@lists.freedesktop.org
+T:     git git://anongit.freedesktop.org/drm/drm-misc
+S:     Maintained
+F:     drivers/gpu/drm/panel/panel-lvds.c
+F:     Documentation/devicetree/bindings/display/panel/lvds.yaml
+
 DRM DRIVER FOR MATROX G200/G400 GRAPHICS CARDS
 S:     Orphan / Obsolete
 F:     drivers/gpu/drm/mga/
@@ -5400,7 +5411,7 @@ F:        include/uapi/drm/nouveau_drm.h
 DRM DRIVER FOR OLIMEX LCD-OLINUXINO PANELS
 M:     Stefan Mavrodiev <stefan@olimex.com>
 S:     Maintained
-F:     Documentation/devicetree/bindings/display/panel/olimex,lcd-olinuxino.txt
+F:     Documentation/devicetree/bindings/display/panel/olimex,lcd-olinuxino.yaml
 F:     drivers/gpu/drm/panel/panel-olimex-lcd-olinuxino.c
 
 DRM DRIVER FOR PERVASIVE DISPLAYS REPAPER PANELS
@@ -5417,7 +5428,7 @@ L:        virtualization@lists.linux-foundation.org
 S:     Obsolete
 W:     https://www.kraxel.org/blog/2014/10/qemu-using-cirrus-considered-harmful/
 T:     git git://anongit.freedesktop.org/drm/drm-misc
-F:     drivers/gpu/drm/cirrus/
+F:     drivers/gpu/drm/tiny/cirrus.c
 
 DRM DRIVER FOR QXL VIRTUAL GPU
 M:     Dave Airlie <airlied@redhat.com>
@@ -5467,7 +5478,7 @@ F:        drivers/gpu/drm/tiny/st7586.c
 DRM DRIVER FOR SITRONIX ST7701 PANELS
 M:     Jagan Teki <jagan@amarulasolutions.com>
 S:     Maintained
-F:     Documentation/devicetree/bindings/display/panel/sitronix,st7701.txt
+F:     Documentation/devicetree/bindings/display/panel/sitronix,st7701.yaml
 F:     drivers/gpu/drm/panel/panel-sitronix-st7701.c
 
 DRM DRIVER FOR SITRONIX ST7735R PANELS
@@ -6193,7 +6204,6 @@ M:        Yash Shah <yash.shah@sifive.com>
 L:     linux-edac@vger.kernel.org
 S:     Supported
 F:     drivers/edac/sifive_edac.c
-F:     drivers/soc/sifive_l2_cache.c
 
 EDAC-SKYLAKE
 M:     Tony Luck <tony.luck@intel.com>
@@ -6253,7 +6263,7 @@ L:        linux-media@vger.kernel.org
 S:     Maintained
 W:     https://linuxtv.org
 T:     git git://linuxtv.org/media_tree.git
-F:     Documentation/media/v4l-drivers/em28xx*
+F:     Documentation/admin-guide/media/em28xx*
 F:     drivers/media/usb/em28xx/
 
 EMBEDDED LINUX
@@ -6734,6 +6744,13 @@ S:       Maintained
 F:     Documentation/devicetree/bindings/crypto/fsl-sec4.txt
 F:     drivers/crypto/caam/
 
+FREESCALE COLDFIRE M5441X MMC DRIVER
+M:     Angelo Dureghello <angelo.dureghello@timesys.com>
+L:     linux-mmc@vger.kernel.org
+S:     Maintained
+F:     drivers/mmc/host/sdhci-esdhc-mcf.c
+F:     include/linux/platform_data/mmc-esdhc-mcf.h
+
 FREESCALE DIU FRAMEBUFFER DRIVER
 M:     Timur Tabi <timur@kernel.org>
 L:     linux-fbdev@vger.kernel.org
@@ -7041,13 +7058,13 @@ R:      Darren Hart <dvhart@infradead.org>
 L:     linux-kernel@vger.kernel.org
 S:     Maintained
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git locking/core
-F:     Documentation/*futex*
+F:     Documentation/locking/*futex*
 F:     include/asm-generic/futex.h
 F:     include/linux/futex.h
 F:     include/uapi/linux/futex.h
 F:     kernel/futex.c
 F:     tools/perf/bench/futex*
-F:     tools/testing/selftests/futex/
+F:     Documentation/locking/*futex*
 
 GATEWORKS SYSTEM CONTROLLER (GSC) DRIVER
 M:     Tim Harvey <tharvey@gateworks.com>
@@ -7487,7 +7504,7 @@ L:        linux-media@vger.kernel.org
 L:     linux-rockchip@lists.infradead.org
 S:     Maintained
 F:     Documentation/devicetree/bindings/media/nxp,imx8mq-vpu.yaml
-F:     Documentation/devicetree/bindings/media/rockchip-vpu.txt
+F:     Documentation/devicetree/bindings/media/rockchip-vpu.yaml
 F:     drivers/staging/media/hantro/
 
 HARD DRIVE ACTIVE PROTECTION SYSTEM (HDAPS) DRIVER
@@ -7528,7 +7545,7 @@ L:        linux-remoteproc@vger.kernel.org
 S:     Maintained
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/andersson/remoteproc.git hwspinlock-next
 F:     Documentation/devicetree/bindings/hwlock/
-F:     Documentation/hwspinlock.txt
+F:     Documentation/locking/hwspinlock.rst
 F:     drivers/hwspinlock/
 F:     include/linux/hwspinlock.h
 
@@ -7761,7 +7778,9 @@ L:        linux-mm@kvack.org
 S:     Maintained
 F:     Documentation/vm/hmm.rst
 F:     include/linux/hmm*
+F:     lib/test_hmm*
 F:     mm/hmm*
+F:     tools/testing/selftests/vm/*hmm*
 
 HOST AP DRIVER
 M:     Jouni Malinen <j@w1.fi>
@@ -7835,10 +7854,10 @@ F:      Documentation/devicetree/bindings/iio/humidity/hts221.txt
 F:     drivers/iio/humidity/hts221*
 
 HUAWEI ETHERNET DRIVER
-M:     Aviad Krawczyk <aviad.krawczyk@huawei.com>
+M:     Bin Luo <luobin9@huawei.com>
 L:     netdev@vger.kernel.org
 S:     Supported
-F:     Documentation/networking/hinic.txt
+F:     Documentation/networking/hinic.rst
 F:     drivers/net/ethernet/huawei/hinic/
 
 HUGETLB FILESYSTEM
@@ -7890,7 +7909,7 @@ S:        Supported
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git
 F:     Documentation/ABI/stable/sysfs-bus-vmbus
 F:     Documentation/ABI/testing/debugfs-hyperv
-F:     Documentation/networking/device_drivers/microsoft/netvsc.txt
+F:     Documentation/networking/device_drivers/microsoft/netvsc.rst
 F:     arch/x86/hyperv
 F:     arch/x86/include/asm/hyperv-tlfs.h
 F:     arch/x86/include/asm/mshyperv.h
@@ -7907,6 +7926,7 @@ F:        drivers/pci/controller/pci-hyperv.c
 F:     drivers/scsi/storvsc_drv.c
 F:     drivers/uio/uio_hv_generic.c
 F:     drivers/video/fbdev/hyperv_fb.c
+F:     include/asm-generic/hyperv-tlfs.h
 F:     include/asm-generic/mshyperv.h
 F:     include/clocksource/hyperv_timer.h
 F:     include/linux/hyperv.h
@@ -8523,6 +8543,13 @@ L:       platform-driver-x86@vger.kernel.org
 S:     Maintained
 F:     drivers/platform/x86/intel_atomisp2_pm.c
 
+INTEL BROXTON PMC DRIVER
+M:     Mika Westerberg <mika.westerberg@linux.intel.com>
+M:     Zha Qipeng <qipeng.zha@intel.com>
+S:     Maintained
+F:     drivers/mfd/intel_pmc_bxt.c
+F:     include/linux/mfd/intel_pmc_bxt.h
+
 INTEL C600 SERIES SAS CONTROLLER DRIVER
 M:     Intel SCU Linux support <intel-linux-scu@intel.com>
 M:     Artur Paszkiewicz <artur.paszkiewicz@intel.com>
@@ -8669,16 +8696,18 @@ M:      Bingbu Cao <bingbu.cao@intel.com>
 R:     Tian Shu Qiu <tian.shu.qiu@intel.com>
 L:     linux-media@vger.kernel.org
 S:     Maintained
-F:     Documentation/media/uapi/v4l/pixfmt-srggb10-ipu3.rst
+F:     Documentation/userspace-api/media/v4l/pixfmt-srggb10-ipu3.rst
 F:     drivers/media/pci/intel/ipu3/
 
 INTEL IPU3 CSI-2 IMGU DRIVER
 M:     Sakari Ailus <sakari.ailus@linux.intel.com>
+R:     Bingbu Cao <bingbu.cao@intel.com>
+R:     Tian Shu Qiu <tian.shu.qiu@intel.com>
 L:     linux-media@vger.kernel.org
 S:     Maintained
-F:     Documentation/media/uapi/v4l/pixfmt-meta-intel-ipu3.rst
-F:     Documentation/media/v4l-drivers/ipu3.rst
-F:     Documentation/media/v4l-drivers/ipu3_rcb.svg
+F:     Documentation/admin-guide/media/ipu3.rst
+F:     Documentation/admin-guide/media/ipu3_rcb.svg
+F:     Documentation/userspace-api/media/v4l/pixfmt-meta-intel-ipu3.rst
 F:     drivers/staging/media/ipu3/
 
 INTEL IXP4XX QMGR, NPE, ETHERNET and HSS SUPPORT
@@ -8730,6 +8759,13 @@ F:       include/uapi/linux/mic_common.h
 F:     include/uapi/linux/mic_ioctl.h
 F:     include/uapi/linux/scif_ioctl.h
 
+INTEL P-Unit IPC DRIVER
+M:     Zha Qipeng <qipeng.zha@intel.com>
+L:     platform-driver-x86@vger.kernel.org
+S:     Maintained
+F:     arch/x86/include/asm/intel_punit_ipc.h
+F:     drivers/platform/x86/intel_punit_ipc.c
+
 INTEL PMC CORE DRIVER
 M:     Rajneesh Bhardwaj <rajneesh.bhardwaj@intel.com>
 M:     Vishwanath Somayaji <vishwanath.somayaji@intel.com>
@@ -8737,15 +8773,6 @@ L:       platform-driver-x86@vger.kernel.org
 S:     Maintained
 F:     drivers/platform/x86/intel_pmc_core*
 
-INTEL PMC/P-Unit IPC DRIVER
-M:     Zha Qipeng<qipeng.zha@intel.com>
-L:     platform-driver-x86@vger.kernel.org
-S:     Maintained
-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>
 S:     Maintained
@@ -8765,8 +8792,8 @@ INTEL PRO/WIRELESS 2100, 2200BG, 2915ABG NETWORK CONNECTION SUPPORT
 M:     Stanislav Yakovlev <stas.yakovlev@gmail.com>
 L:     linux-wireless@vger.kernel.org
 S:     Maintained
-F:     Documentation/networking/device_drivers/intel/ipw2100.txt
-F:     Documentation/networking/device_drivers/intel/ipw2200.txt
+F:     Documentation/networking/device_drivers/intel/ipw2100.rst
+F:     Documentation/networking/device_drivers/intel/ipw2200.rst
 F:     drivers/net/wireless/intel/ipw2x00/
 
 INTEL PSTATE DRIVER
@@ -8784,6 +8811,12 @@ S:       Supported
 F:     drivers/infiniband/hw/i40iw/
 F:     include/uapi/rdma/i40iw-abi.h
 
+INTEL SCU DRIVERS
+M:     Mika Westerberg <mika.westerberg@linux.intel.com>
+S:     Maintained
+F:     arch/x86/include/asm/intel_scu_ipc.h
+F:     drivers/platform/x86/intel_scu_*
+
 INTEL SPEED SELECT TECHNOLOGY
 M:     Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
 L:     platform-driver-x86@vger.kernel.org
@@ -8850,6 +8883,13 @@ F:       Documentation/admin-guide/wimax/i2400m.rst
 F:     drivers/net/wimax/i2400m/
 F:     include/uapi/linux/wimax/i2400m.h
 
+INTEL WMI SLIM BOOTLOADER (SBL) FIRMWARE UPDATE DRIVER
+M:     Jithu Joseph <jithu.joseph@intel.com>
+R:     Maurice Ma <maurice.ma@intel.com>
+S:     Maintained
+W:     https://slimbootloader.github.io/security/firmware-update.html
+F:     drivers/platform/x86/intel-wmi-sbl-fw-update.c
+
 INTEL WMI THUNDERBOLT FORCE POWER DRIVER
 M:     Mario Limonciello <mario.limonciello@dell.com>
 S:     Maintained
@@ -8935,7 +8975,7 @@ M:        Corey Minyard <minyard@acm.org>
 L:     openipmi-developer@lists.sourceforge.net (moderated for non-subscribers)
 S:     Supported
 W:     http://openipmi.sourceforge.net/
-F:     Documentation/IPMI.txt
+F:     Documentation/driver-api/ipmi.rst
 F:     Documentation/devicetree/bindings/ipmi/
 F:     drivers/char/ipmi/
 F:     include/linux/ipmi*
@@ -8957,7 +8997,7 @@ L:        lvs-devel@vger.kernel.org
 S:     Maintained
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs-next.git
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs.git
-F:     Documentation/networking/ipvs-sysctl.txt
+F:     Documentation/networking/ipvs-sysctl.rst
 F:     include/net/ip_vs.h
 F:     include/uapi/linux/ip_vs.h
 F:     net/netfilter/ipvs/
@@ -8977,7 +9017,7 @@ IRQ DOMAINS (IRQ NUMBER MAPPING LIBRARY)
 M:     Marc Zyngier <maz@kernel.org>
 S:     Maintained
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git irq/core
-F:     Documentation/IRQ-domain.txt
+F:     Documentation/core-api/irq/irq-domain.rst
 F:     include/linux/irqdomain.h
 F:     kernel/irq/irqdomain.c
 F:     kernel/irq/msi.c
@@ -9102,7 +9142,7 @@ L:        linux-media@vger.kernel.org
 S:     Maintained
 W:     https://linuxtv.org
 T:     git git://linuxtv.org/media_tree.git
-F:     Documentation/media/v4l-drivers/ivtv*
+F:     Documentation/admin-guide/media/ivtv*
 F:     drivers/media/pci/ivtv/
 F:     include/uapi/linux/ivtv*
 
@@ -9332,7 +9372,6 @@ F:        arch/arm64/include/asm/kvm*
 F:     arch/arm64/include/uapi/asm/kvm*
 F:     arch/arm64/kvm/
 F:     include/kvm/arm_*
-F:     virt/kvm/arm/
 
 KERNEL VIRTUAL MACHINE FOR MIPS (KVM/mips)
 L:     linux-mips@vger.kernel.org
@@ -9543,7 +9582,7 @@ F:        drivers/soc/lantiq
 LAPB module
 L:     linux-x25@vger.kernel.org
 S:     Orphan
-F:     Documentation/networking/lapb-module.txt
+F:     Documentation/networking/lapb-module.rst
 F:     include/*/lapb.h
 F:     net/lapb/
 
@@ -10114,7 +10153,7 @@ S:      Maintained
 W:     https://wireless.wiki.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
-F:     Documentation/networking/mac80211-injection.txt
+F:     Documentation/networking/mac80211-injection.rst
 F:     Documentation/networking/mac80211_hwsim/mac80211_hwsim.rst
 F:     drivers/net/wireless/mac80211_hwsim.[ch]
 F:     include/net/mac80211.h
@@ -10295,7 +10334,7 @@ L:      linux-media@vger.kernel.org
 S:     Maintained
 T:     git git://linuxtv.org/media_tree.git
 F:     Documentation/devicetree/bindings/media/i2c/max2175.txt
-F:     Documentation/media/v4l-drivers/max2175.rst
+F:     Documentation/userspace-api/media/drivers/max2175.rst
 F:     drivers/media/i2c/max2175*
 F:     include/uapi/linux/max2175.h
 
@@ -10495,8 +10534,8 @@ M:      Philipp Zabel <p.zabel@pengutronix.de>
 L:     linux-media@vger.kernel.org
 S:     Maintained
 T:     git git://linuxtv.org/media_tree.git
+F:     Documentation/admin-guide/media/imx.rst
 F:     Documentation/devicetree/bindings/media/imx.txt
-F:     Documentation/media/v4l-drivers/imx.rst
 F:     drivers/staging/media/imx/
 F:     include/linux/imx-media.h
 F:     include/media/imx.h
@@ -10506,9 +10545,9 @@ M:      Rui Miguel Silva <rmfrfs@gmail.com>
 L:     linux-media@vger.kernel.org
 S:     Maintained
 T:     git git://linuxtv.org/media_tree.git
+F:     Documentation/admin-guide/media/imx7.rst
 F:     Documentation/devicetree/bindings/media/imx7-csi.txt
 F:     Documentation/devicetree/bindings/media/imx7-mipi-csi2.txt
-F:     Documentation/media/v4l-drivers/imx7.rst
 F:     drivers/staging/media/imx/imx7-media-csi.c
 F:     drivers/staging/media/imx/imx7-mipi-csis.c
 
@@ -10654,8 +10693,10 @@ S:     Maintained
 W:     https://linuxtv.org
 Q:     http://patchwork.kernel.org/project/linux-media/list/
 T:     git git://linuxtv.org/media_tree.git
+F:     Documentation/admin-guide/media/
 F:     Documentation/devicetree/bindings/media/
-F:     Documentation/media/
+F:     Documentation/driver-api/media/
+F:     Documentation/userspace-api/media/
 F:     drivers/media/
 F:     drivers/staging/media/
 F:     include/linux/platform_data/media/
@@ -11055,10 +11096,12 @@ F:    drivers/mtd/nand/raw/meson_*
 
 MESON VIDEO DECODER DRIVER FOR AMLOGIC SOCS
 M:     Maxime Jourdan <mjourdan@baylibre.com>
+M:     Neil Armstrong <narmstrong@baylibre.com>
 L:     linux-media@vger.kernel.org
 L:     linux-amlogic@lists.infradead.org
 S:     Supported
 T:     git git://linuxtv.org/media_tree.git
+F:     Documentation/devicetree/bindings/media/amlogic,gx-vdec.yaml
 F:     drivers/staging/media/meson/vdec/
 
 METHODE UDPU SUPPORT
@@ -11439,7 +11482,7 @@ F:      drivers/regulator/mpq7920.h
 MOTION EYE VAIO PICTUREBOOK CAMERA DRIVER
 S:     Orphan
 W:     http://popies.net/meye/
-F:     Documentation/media/v4l-drivers/meye*
+F:     Documentation/userspace-api/media/drivers/meye*
 F:     drivers/media/pci/meye/
 F:     include/uapi/linux/meye.h
 
@@ -11698,8 +11741,8 @@ NETERION 10GbE DRIVERS (s2io/vxge)
 M:     Jon Mason <jdmason@kudzu.us>
 L:     netdev@vger.kernel.org
 S:     Supported
-F:     Documentation/networking/device_drivers/neterion/s2io.txt
-F:     Documentation/networking/device_drivers/neterion/vxge.txt
+F:     Documentation/networking/device_drivers/neterion/s2io.rst
+F:     Documentation/networking/device_drivers/neterion/vxge.rst
 F:     drivers/net/ethernet/neterion/
 
 NETFILTER
@@ -12466,6 +12509,15 @@ S:     Maintained
 T:     git git://linuxtv.org/media_tree.git
 F:     drivers/media/i2c/ov2685.c
 
+OMNIVISION OV2740 SENSOR DRIVER
+M:     Tianshu Qiu <tian.shu.qiua@intel.com>
+R:     Shawn Tu <shawnx.tu@intel.com>
+R:     Bingbu Cao <bingbu.cao@intel.com>
+L:     linux-media@vger.kernel.org
+S:     Maintained
+T:     git git://linuxtv.org/media_tree.git
+F:     drivers/media/i2c/ov2740.c
+
 OMNIVISION OV5640 SENSOR DRIVER
 M:     Steve Longerbeam <slongerbeam@gmail.com>
 L:     linux-media@vger.kernel.org
@@ -12528,10 +12580,11 @@ F:    Documentation/devicetree/bindings/media/i2c/ov7740.txt
 F:     drivers/media/i2c/ov7740.c
 
 OMNIVISION OV8856 SENSOR DRIVER
-M:     Ben Kao <ben.kao@intel.com>
+M:     Dongchun Zhu <dongchun.zhu@mediatek.com>
 L:     linux-media@vger.kernel.org
 S:     Maintained
 T:     git git://linuxtv.org/media_tree.git
+F:     Documentation/devicetree/bindings/media/i2c/ov8856.yaml
 F:     drivers/media/i2c/ov8856.c
 
 OMNIVISION OV9640 SENSOR DRIVER
@@ -12806,7 +12859,7 @@ M:      "James E.J. Bottomley" <James.Bottomley@HansenPartnership.com>
 M:     Helge Deller <deller@gmx.de>
 L:     linux-parisc@vger.kernel.org
 S:     Maintained
-W:     http://www.parisc-linux.org/
+W:     https://parisc.wiki.kernel.org
 Q:     http://patchwork.kernel.org/project/linux-parisc/list/
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/parisc-2.6.git
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux.git
@@ -13305,7 +13358,7 @@ F:      drivers/input/joystick/pxrc.c
 PHONET PROTOCOL
 M:     Remi Denis-Courmont <courmisch@gmail.com>
 S:     Supported
-F:     Documentation/networking/phonet.txt
+F:     Documentation/networking/phonet.rst
 F:     include/linux/phonet.h
 F:     include/net/phonet/
 F:     include/uapi/linux/phonet.h
@@ -13753,8 +13806,8 @@ M:      Hans Verkuil <hverkuil@xs4all.nl>
 L:     linux-media@vger.kernel.org
 S:     Maintained
 T:     git git://linuxtv.org/media_tree.git
-F:     Documentation/media/cec-drivers/pulse8-cec.rst
-F:     drivers/media/usb/pulse8-cec/*
+F:     Documentation/admin-guide/media/pulse8-cec.rst
+F:     drivers/media/cec/usb/pulse8/
 
 PVRUSB2 VIDEO4LINUX DRIVER
 M:     Mike Isely <isely@pobox.com>
@@ -13763,7 +13816,7 @@ L:      linux-media@vger.kernel.org
 S:     Maintained
 W:     http://www.isely.net/pvrusb2/
 T:     git git://linuxtv.org/media_tree.git
-F:     Documentation/media/v4l-drivers/pvrusb2*
+F:     Documentation/driver-api/media/drivers/pvrusb2*
 F:     drivers/media/usb/pvrusb2/
 
 PWC WEBCAM DRIVER
@@ -14010,8 +14063,8 @@ QUALCOMM CAMERA SUBSYSTEM DRIVER
 M:     Todor Tomov <todor.too@gmail.com>
 L:     linux-media@vger.kernel.org
 S:     Maintained
+F:     Documentation/admin-guide/media/qcom_camss.rst
 F:     Documentation/devicetree/bindings/media/qcom,camss.txt
-F:     Documentation/media/v4l-drivers/qcom_camss.rst
 F:     drivers/media/platform/qcom/camss/
 
 QUALCOMM CORE POWER REDUCTION (CPR) AVS DRIVER
@@ -14075,7 +14128,7 @@ M:      Subash Abhinov Kasiviswanathan <subashab@codeaurora.org>
 M:     Sean Tranchetti <stranche@codeaurora.org>
 L:     netdev@vger.kernel.org
 S:     Maintained
-F:     Documentation/networking/device_drivers/qualcomm/rmnet.txt
+F:     Documentation/networking/device_drivers/qualcomm/rmnet.rst
 F:     drivers/net/ethernet/qualcomm/rmnet/
 F:     include/linux/if_rmnet.h
 
@@ -14106,7 +14159,7 @@ F:      drivers/net/wireless/ath/wcn36xx/
 
 QUANTENNA QTNFMAC WIRELESS DRIVER
 M:     Igor Mitsyanko <imitsyanko@quantenna.com>
-M:     Sergey Matyukevich <smatyukevich@quantenna.com>
+R:     Sergey Matyukevich <geomatsi@gmail.com>
 L:     linux-wireless@vger.kernel.org
 S:     Maintained
 F:     drivers/net/wireless/quantenna
@@ -14114,7 +14167,6 @@ F:      drivers/net/wireless/quantenna
 RADEON and AMDGPU DRM DRIVERS
 M:     Alex Deucher <alexander.deucher@amd.com>
 M:     Christian König <christian.koenig@amd.com>
-M:     David (ChunMing) Zhou <David1.Zhou@amd.com>
 L:     amd-gfx@lists.freedesktop.org
 S:     Supported
 T:     git git://people.freedesktop.org/~agd5f/linux
@@ -14167,7 +14219,7 @@ M:      Hans Verkuil <hverkuil@xs4all.nl>
 L:     linux-media@vger.kernel.org
 S:     Maintained
 T:     git git://linuxtv.org/media_tree.git
-F:     drivers/media/usb/rainshadow-cec/*
+F:     drivers/media/cec/usb/rainshadow/
 
 RALINK MIPS ARCHITECTURE
 M:     John Crispin <john@phrozen.org>
@@ -14261,7 +14313,7 @@ L:      linux-rdma@vger.kernel.org
 L:     rds-devel@oss.oracle.com (moderated for non-subscribers)
 S:     Supported
 W:     https://oss.oracle.com/projects/rds/
-F:     Documentation/networking/rds.txt
+F:     Documentation/networking/rds.rst
 F:     net/rds/
 
 RDT - RESOURCE ALLOCATION
@@ -14270,7 +14322,7 @@ M:      Reinette Chatre <reinette.chatre@intel.com>
 L:     linux-kernel@vger.kernel.org
 S:     Supported
 F:     Documentation/x86/resctrl*
-F:     arch/x86/include/asm/resctrl_sched.h
+F:     arch/x86/include/asm/resctrl.h
 F:     arch/x86/kernel/cpu/resctrl/
 F:     tools/testing/selftests/resctrl/
 
@@ -14520,10 +14572,19 @@ ROCKCHIP RASTER 2D GRAPHIC ACCELERATION UNIT DRIVER
 M:     Jacob Chen <jacob-chen@iotwrt.com>
 M:     Ezequiel Garcia <ezequiel@collabora.com>
 L:     linux-media@vger.kernel.org
+L:     linux-rockchip@lists.infradead.org
 S:     Maintained
-F:     Documentation/devicetree/bindings/media/rockchip-rga.txt
+F:     Documentation/devicetree/bindings/media/rockchip-rga.yaml
 F:     drivers/media/platform/rockchip/rga/
 
+ROCKCHIP VIDEO DECODER DRIVER
+M:     Ezequiel Garcia <ezequiel@collabora.com>
+L:     linux-media@vger.kernel.org
+L:     linux-rockchip@lists.infradead.org
+S:     Maintained
+F:     Documentation/devicetree/bindings/media/rockchip,vdec.yaml
+F:     drivers/staging/media/rkvdec/
+
 ROCKER DRIVER
 M:     Jiri Pirko <jiri@resnulli.us>
 L:     netdev@vger.kernel.org
@@ -14635,7 +14696,7 @@ M:      David Howells <dhowells@redhat.com>
 L:     linux-afs@lists.infradead.org
 S:     Supported
 W:     https://www.infradead.org/~dhowells/kafs/
-F:     Documentation/networking/rxrpc.txt
+F:     Documentation/networking/rxrpc.rst
 F:     include/keys/rxrpc-type.h
 F:     include/net/af_rxrpc.h
 F:     include/trace/events/rxrpc.h
@@ -14677,6 +14738,7 @@ S:      Supported
 W:     http://www.ibm.com/developerworks/linux/linux390/
 F:     block/partitions/ibm.c
 F:     drivers/s390/block/dasd*
+F:     include/linux/dasd_mod.h
 
 S390 IOMMU (PCI)
 M:     Gerald Schaefer <gerald.schaefer@de.ibm.com>
@@ -14772,7 +14834,7 @@ L:      linux-media@vger.kernel.org
 S:     Odd fixes
 W:     https://linuxtv.org
 T:     git git://linuxtv.org/media_tree.git
-F:     Documentation/media/v4l-drivers/saa7134*
+F:     Documentation/driver-api/media/drivers/saa7134*
 F:     drivers/media/pci/saa7134/
 
 SAA7146 VIDEO4LINUX-2 DRIVER
@@ -15043,7 +15105,7 @@ M:      Marcelo Ricardo Leitner <marcelo.leitner@gmail.com>
 L:     linux-sctp@vger.kernel.org
 S:     Maintained
 W:     http://lksctp.sourceforge.net
-F:     Documentation/networking/sctp.txt
+F:     Documentation/networking/sctp.rst
 F:     include/linux/sctp.h
 F:     include/net/sctp/
 F:     include/uapi/linux/sctp.h
@@ -15270,11 +15332,6 @@ T:     git git://linuxtv.org/media_tree.git
 F:     drivers/media/i2c/rj54n1cb0c.c
 F:     include/media/i2c/rj54n1cb0c.h
 
-SH_VEU V4L2 MEM2MEM DRIVER
-L:     linux-media@vger.kernel.org
-S:     Orphan
-F:     drivers/media/platform/sh_veu.c
-
 SH_VOU V4L2 OUTPUT DRIVER
 L:     linux-media@vger.kernel.org
 S:     Orphan
@@ -15519,6 +15576,15 @@ M:     Nicolas Pitre <nico@fluxnic.net>
 S:     Odd Fixes
 F:     drivers/net/ethernet/smsc/smc91x.*
 
+SECURE MONITOR CALL(SMC) CALLING CONVENTION (SMCCC)
+M:     Mark Rutland <mark.rutland@arm.com>
+M:     Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
+M:     Sudeep Holla <sudeep.holla@arm.com>
+L:     linux-arm-kernel@lists.infradead.org
+S:     Maintained
+F:     drivers/firmware/smccc/
+F:     include/linux/arm-smccc.h
+
 SMIA AND SMIA++ IMAGE SENSOR DRIVER
 M:     Sakari Ailus <sakari.ailus@linux.intel.com>
 L:     linux-media@vger.kernel.org
@@ -15587,7 +15653,7 @@ SOCIONEXT (SNI) AVE NETWORK DRIVER
 M:     Kunihiko Hayashi <hayashi.kunihiko@socionext.com>
 L:     netdev@vger.kernel.org
 S:     Maintained
-F:     Documentation/devicetree/bindings/net/socionext,uniphier-ave4.txt
+F:     Documentation/devicetree/bindings/net/socionext,uniphier-ave4.yaml
 F:     drivers/net/ethernet/socionext/sni_ave.c
 
 SOCIONEXT (SNI) NETSEC NETWORK DRIVER
@@ -15695,7 +15761,7 @@ F:      drivers/ssb/
 F:     include/linux/ssb/
 
 SONY IMX214 SENSOR DRIVER
-M:     Ricardo Ribalda <ricardo.ribalda@gmail.com>
+M:     Ricardo Ribalda <ribalda@kernel.org>
 L:     linux-media@vger.kernel.org
 S:     Maintained
 T:     git git://linuxtv.org/media_tree.git
@@ -15918,7 +15984,7 @@ SPIDERNET NETWORK DRIVER for CELL
 M:     Ishizaki Kou <kou.ishizaki@toshiba.co.jp>
 L:     netdev@vger.kernel.org
 S:     Supported
-F:     Documentation/networking/device_drivers/toshiba/spider_net.txt
+F:     Documentation/networking/device_drivers/toshiba/spider_net.rst
 F:     drivers/net/ethernet/toshiba/spider_net*
 
 SPMI SUBSYSTEM
@@ -15935,7 +16001,7 @@ M:      Jeremy Kerr <jk@ozlabs.org>
 L:     linuxppc-dev@lists.ozlabs.org
 S:     Supported
 W:     http://www.ibm.com/developerworks/power/cell/
-F:     Documentation/filesystems/spufs.txt
+F:     Documentation/filesystems/spufs/spufs.rst
 F:     arch/powerpc/platforms/cell/spufs/
 
 SQUASHFS FILE SYSTEM
@@ -15988,6 +16054,13 @@ L:     stable@vger.kernel.org
 S:     Supported
 F:     Documentation/process/stable-kernel-rules.rst
 
+STAGING - ATOMISP DRIVER
+M:     Mauro Carvalho Chehab <mchehab@kernel.org>
+R:     Sakari Ailus <sakari.ailus@linux.intel.com>
+L:     linux-media@vger.kernel.org
+S:     Maintained
+F:     drivers/staging/media/atomisp/
+
 STAGING - COMEDI
 M:     Ian Abbott <abbotti@mev.co.uk>
 M:     H Hartley Sweeten <hsweeten@visionengravers.com>
@@ -16682,7 +16755,7 @@ S:      Maintained
 F:     sound/soc/ti/
 
 TEXAS INSTRUMENTS' DAC7612 DAC DRIVER
-M:     Ricardo Ribalda <ricardo@ribalda.com>
+M:     Ricardo Ribalda <ribalda@kernel.org>
 L:     linux-iio@vger.kernel.org
 S:     Supported
 F:     Documentation/devicetree/bindings/iio/dac/ti,dac7612.txt
@@ -17015,7 +17088,7 @@ M:      Samuel Chessman <chessman@tux.org>
 L:     tlan-devel@lists.sourceforge.net (subscribers-only)
 S:     Maintained
 W:     http://sourceforge.net/projects/tlan/
-F:     Documentation/networking/device_drivers/ti/tlan.txt
+F:     Documentation/networking/device_drivers/ti/tlan.rst
 F:     drivers/net/ethernet/ti/tlan.*
 
 TM6000 VIDEO4LINUX DRIVER
@@ -17024,7 +17097,7 @@ L:      linux-media@vger.kernel.org
 S:     Odd fixes
 W:     https://linuxtv.org
 T:     git git://linuxtv.org/media_tree.git
-F:     Documentation/media/v4l-drivers/tm6000*
+F:     Documentation/admin-guide/media/tm6000*
 F:     drivers/media/usb/tm6000/
 
 TMIO/SDHI MMC DRIVER
@@ -17205,7 +17278,7 @@ TUN/TAP driver
 M:     Maxim Krasnyansky <maxk@qti.qualcomm.com>
 S:     Maintained
 W:     http://vtun.sourceforge.net/tun
-F:     Documentation/networking/tuntap.txt
+F:     Documentation/networking/tuntap.rst
 F:     arch/um/os-Linux/drivers/
 
 TURBOCHANNEL SUBSYSTEM
@@ -17705,7 +17778,7 @@ L:      linux-media@vger.kernel.org
 S:     Maintained
 W:     http://royale.zerezo.com/zr364xx/
 T:     git git://linuxtv.org/media_tree.git
-F:     Documentation/media/v4l-drivers/zr364xx*
+F:     Documentation/admin-guide/media/zr364xx*
 F:     drivers/media/usb/zr364xx/
 
 USER-MODE LINUX (UML)
@@ -17854,7 +17927,7 @@ L:      linux-media@vger.kernel.org
 S:     Maintained
 W:     https://linuxtv.org
 T:     git git://linuxtv.org/media_tree.git
-F:     drivers/media/platform/vicodec/*
+F:     drivers/media/test-drivers/vicodec/*
 
 VIDEO I2C POLLING DRIVER
 M:     Matt Ranostay <matt.ranostay@konsulko.com>
@@ -17885,7 +17958,7 @@ L:      linux-media@vger.kernel.org
 S:     Maintained
 W:     https://linuxtv.org
 T:     git git://linuxtv.org/media_tree.git
-F:     drivers/media/platform/vimc/*
+F:     drivers/media/test-drivers/vimc/*
 
 VIRT LIB
 M:     Alex Williamson <alex.williamson@redhat.com>
@@ -18052,7 +18125,7 @@ L:      linux-media@vger.kernel.org
 S:     Maintained
 W:     https://linuxtv.org
 T:     git git://linuxtv.org/media_tree.git
-F:     drivers/media/platform/vivid/*
+F:     drivers/media/test-drivers/vivid/*
 
 VLYNQ BUS
 M:     Florian Fainelli <f.fainelli@gmail.com>
@@ -18150,7 +18223,7 @@ M:      David Ahern <dsahern@kernel.org>
 M:     Shrijeet Mukherjee <shrijeet@gmail.com>
 L:     netdev@vger.kernel.org
 S:     Maintained
-F:     Documentation/networking/vrf.txt
+F:     Documentation/networking/vrf.rst
 F:     drivers/net/vrf.c
 
 VSPRINTF
@@ -18495,8 +18568,12 @@ R:     Jonathan Lemon <jonathan.lemon@gmail.com>
 L:     netdev@vger.kernel.org
 L:     bpf@vger.kernel.org
 S:     Maintained
-F:     kernel/bpf/xskmap.c
+F:     include/net/xdp_sock*
+F:     include/net/xsk_buff_pool.h
+F:     include/uapi/linux/if_xdp.h
 F:     net/xdp/
+F:     samples/bpf/xdpsock*
+F:     tools/lib/bpf/xsk*
 
 XEN BLOCK SUBSYSTEM
 M:     Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
@@ -18586,8 +18663,8 @@ W:      http://xfs.org/
 T:     git git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git
 F:     Documentation/ABI/testing/sysfs-fs-xfs
 F:     Documentation/admin-guide/xfs.rst
-F:     Documentation/filesystems/xfs-delayed-logging-design.txt
-F:     Documentation/filesystems/xfs-self-describing-metadata.txt
+F:     Documentation/filesystems/xfs-delayed-logging-design.rst
+F:     Documentation/filesystems/xfs-self-describing-metadata.rst
 F:     fs/xfs/
 F:     include/uapi/linux/dqblk_xfs.h
 F:     include/uapi/linux/fsmap.h
@@ -18688,7 +18765,7 @@ L:      linux-hams@vger.kernel.org
 S:     Maintained
 W:     http://yaina.de/jreuter/
 W:     http://www.qsl.net/dl1bke/
-F:     Documentation/networking/z8530drv.txt
+F:     Documentation/networking/z8530drv.rst
 F:     drivers/net/hamradio/*scc.c
 F:     drivers/net/hamradio/z8530.h