linux-kernel - [RFC PATCH 2/2] MAINTAINERS: various pattern fixes for mv/rm/typos

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives
Hash Suite: Windows password security audit tool. GUI, reports in PDF.
[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <9079e1a8a03b4f5dc26a26a9d7e14d941d4ccf9f.1509401037.git.tom.saeger@oracle.com>
Date:   Tue, 31 Oct 2017 09:46:13 -0500
From:   Tom Saeger <tom.saeger@...cle.com>
To:     Joe Perches <joe@...ches.com>
Cc:     Tom Saeger <tom.saeger@...cle.com>,
        "David S. Miller" <davem@...emloft.net>,
        Greg Kroah-Hartman <gregkh@...uxfoundation.org>,
        Mauro Carvalho Chehab <mchehab@...nel.org>,
        Randy Dunlap <rdunlap@...radead.org>,
        Andrew Morton <akpm@...ux-foundation.org>,
        linux-kernel@...r.kernel.org
Subject: [RFC PATCH 2/2] MAINTAINERS: various pattern fixes for mv/rm/typos


Several stale or typo'd "F" "X" patterns fixed.

Signed-off-by: Tom Saeger <tom.saeger@...cle.com>
---
 MAINTAINERS | 107 ++++++++++++++++++++++++------------------------------------
 1 file changed, 42 insertions(+), 65 deletions(-)

diff --git a/MAINTAINERS b/MAINTAINERS
index af0cb69f6a3e..8ba5ec8584dc 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -885,7 +885,6 @@ L:	devel@...verdev.osuosl.org
 S:	Supported
 F:	drivers/staging/android/ion
 F:	drivers/staging/android/uapi/ion.h
-F:	drivers/staging/android/uapi/ion_test.h
 
 AOA (Apple Onboard Audio) ALSA DRIVER
 M:	Johannes Berg <johannes@...solutions.net>
@@ -1279,7 +1278,6 @@ M:	Russell King <linux@...linux.org.uk>
 L:	linux-arm-kernel@...ts.infradead.org (moderated for non-subscribers)
 S:	Maintained
 T:	git git://git.armlinux.org.uk/~rmk/linux-arm.git clkdev
-F:	arch/arm/include/asm/clkdev.h
 F:	drivers/clk/clkdev.c
 
 ARM/COMPULAB CM-X270/EM-X270 and CM-X300 MACHINE SUPPORT
@@ -1687,7 +1685,7 @@ M:	Tomas Cech <sleep_walker@...e.com>
 L:	linux-arm-kernel@...ts.infradead.org
 W:	http://hackndev.com
 S:	Maintained
-F:	arch/arm/mach-pxa/include/mach/palmtreo.h
+F:	arch/arm/mach-pxa/palmtreo.h
 F:	arch/arm/mach-pxa/palmtreo.c
 
 ARM/PALMTX,PALMT5,PALMLD,PALMTE2,PALMTC SUPPORT
@@ -1697,11 +1695,11 @@ W:	http://hackndev.com
 S:	Maintained
 F:	arch/arm/mach-pxa/include/mach/palmtx.h
 F:	arch/arm/mach-pxa/palmtx.c
-F:	arch/arm/mach-pxa/include/mach/palmt5.h
+F:	arch/arm/mach-pxa/palmt5.h
 F:	arch/arm/mach-pxa/palmt5.c
 F:	arch/arm/mach-pxa/include/mach/palmld.h
 F:	arch/arm/mach-pxa/palmld.c
-F:	arch/arm/mach-pxa/include/mach/palmte2.h
+F:	arch/arm/mach-pxa/palmte2.h
 F:	arch/arm/mach-pxa/palmte2.c
 F:	arch/arm/mach-pxa/include/mach/palmtc.h
 F:	arch/arm/mach-pxa/palmtc.c
@@ -1711,7 +1709,7 @@ M:	Sergey Lapin <slapin@...fans.org>
 L:	linux-arm-kernel@...ts.infradead.org
 W:	http://hackndev.com
 S:	Maintained
-F:	arch/arm/mach-pxa/include/mach/palmz72.h
+F:	arch/arm/mach-pxa/palmz72.h
 F:	arch/arm/mach-pxa/palmz72.c
 
 ARM/PLEB SUPPORT
@@ -1741,7 +1739,6 @@ F:	drivers/clk/qcom/
 F:	drivers/dma/qcom/
 F:	drivers/soc/qcom/
 F:	drivers/spi/spi-qup.c
-F:	drivers/tty/serial/msm_serial.h
 F:	drivers/tty/serial/msm_serial.c
 F:	drivers/*/pm8???-*
 F:	drivers/mfd/ssbi.c
@@ -1870,7 +1867,6 @@ M:	Andrzej Hajda <a.hajda@...sung.com>
 L:	linux-arm-kernel@...ts.infradead.org
 L:	linux-media@...r.kernel.org
 S:	Maintained
-F:	arch/arm/plat-samsung/s5p-dev-mfc.c
 F:	drivers/media/platform/s5p-mfc/
 
 ARM/SHMOBILE ARM ARCHITECTURE
@@ -1908,7 +1904,7 @@ F:	drivers/clk/socfpga/
 ARM/SOCFPGA EDAC SUPPORT
 M:	Thor Thayer <thor.thayer@...ux.intel.com>
 S:	Maintained
-F:	drivers/edac/altera_edac.
+F:	drivers/edac/altera_edac.*
 
 ARM/STI ARCHITECTURE
 M:	Patrice Chotard <patrice.chotard@...com>
@@ -2348,7 +2344,7 @@ M:	Ludovic Desroches <ludovic.desroches@...rochip.com>
 L:	linux-media@...r.kernel.org
 S:	Supported
 F:	drivers/media/platform/atmel/atmel-isi.c
-F:	include/media/atmel-isi.h
+F:	drivers/media/platform/atmel/atmel-isi.h
 
 ATMEL LCDFB DRIVER
 M:	Nicolas Ferre <nicolas.ferre@...rochip.com>
@@ -2923,7 +2919,7 @@ N:	bcm583*
 N:	bcm585*
 N:	bcm586*
 N:	bcm88312
-F:	arch/arm64/boot/dts/broadcom/ns2*
+F:	arch/arm64/boot/dts/broadcom/northstar2/*
 F:	drivers/clk/bcm/clk-ns*
 F:	drivers/pinctrl/bcm/pinctrl-ns*
 
@@ -3016,7 +3012,7 @@ M:	Clemens Ladisch <clemens@...isch.de>
 L:	alsa-devel@...a-project.org (moderated for non-subscribers)
 T:	git git://git.alsa-project.org/alsa-kernel.git
 S:	Maintained
-F:	Documentation/sound/alsa/Bt87x.txt
+F:	Documentation/sound/cards/bt87x.rst
 F:	sound/pci/bt87x.c
 
 BT8XXGPIO DRIVER
@@ -3298,7 +3294,7 @@ M:	David Howells <dhowells@...hat.com>
 M:	David Woodhouse <dwmw2@...radead.org>
 L:	keyrings@...r.kernel.org
 S:	Maintained
-F:	Documentation/module-signing.txt
+F:	Documentation/admin-guide/module-signing.rst
 F:	certs/
 F:	scripts/sign-file.c
 F:	scripts/extract-cert.c
@@ -3579,7 +3575,7 @@ T:	git git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git
 S:	Maintained
 F:	Documentation/cgroup-v1/cpusets.txt
 F:	include/linux/cpuset.h
-F:	kernel/cpuset.c
+F:	kernel/cgroup/cpuset.c
 
 CONTROL GROUP - MEMORY RESOURCE CONTROLLER (MEMCG)
 M:	Johannes Weiner <hannes@...xchg.org>
@@ -3720,7 +3716,6 @@ T:	git git://linuxtv.org/media_tree.git
 W:	http://linuxtv.org
 S:	Odd Fixes
 F:	drivers/media/i2c/cs3308.c
-F:	drivers/media/i2c/cs3308.h
 
 CS5535 Audio ALSA driver
 M:	Jaya Kumar <jayakumar.alsa@...il.com>
@@ -3751,7 +3746,7 @@ T:	git git://linuxtv.org/media_tree.git
 W:	https://linuxtv.org
 S:	Maintained
 F:	drivers/media/common/cx2341x*
-F:	include/media/cx2341x*
+F:	include/media/drv-intf/cx2341x*
 
 CX24120 MEDIA DRIVER
 M:	Jemma Denson <jdenson@...il.com>
@@ -3859,7 +3854,7 @@ M:	Uma Krishnan <ukrishn@...ux.vnet.ibm.com>
 L:	linux-scsi@...r.kernel.org
 S:	Supported
 F:	drivers/scsi/cxlflash/
-F:	include/uapi/scsi/cxlflash_ioctls.h
+F:	include/uapi/scsi/cxlflash_ioctl.h
 F:	Documentation/powerpc/cxlflash.txt
 
 CYBERPRO FB DRIVER
@@ -3902,7 +3897,7 @@ D-LINK DIR-685 TOUCHKEYS DRIVER
 M:	Linus Walleij <linus.walleij@...aro.org>
 L:	linux-input@...r.kernel.org
 S:	Supported
-F:	drivers/input/dlink-dir685-touchkeys.c
+F:	drivers/input/keyboard/dlink-dir685-touchkeys.c
 
 DALLAS/MAXIM DS1685-FAMILY REAL TIME CLOCK
 M:	Joshua Kinard <kumba@...too.org>
@@ -4114,7 +4109,7 @@ F:	Documentation/devicetree/bindings/mfd/da90*.txt
 F:	Documentation/devicetree/bindings/input/da90??-onkey.txt
 F:	Documentation/devicetree/bindings/thermal/da90??-thermal.txt
 F:	Documentation/devicetree/bindings/regulator/da92*.txt
-F:	Documentation/devicetree/bindings/watchdog/da92??-wdt.txt
+F:	Documentation/devicetree/bindings/watchdog/da90??-wdt.txt
 F:	Documentation/devicetree/bindings/sound/da[79]*.txt
 F:	drivers/gpio/gpio-da90??.c
 F:	drivers/hwmon/da90??-hwmon.c
@@ -4450,7 +4445,7 @@ DRM DRIVER FOR SITRONIX ST7586 PANELS
 M:	David Lechner <david@...hnology.com>
 S:	Maintained
 F:	drivers/gpu/drm/tinydrm/st7586.c
-F:	Documentation/devicetree/bindings/display/st7586.txt
+F:	Documentation/devicetree/bindings/display/sitronix,st7586.txt
 
 DRM DRIVER FOR TDFX VIDEO CARDS
 S:	Orphan / Obsolete
@@ -4483,7 +4478,6 @@ F:	drivers/gpu/drm/
 F:	drivers/gpu/vga/
 F:	Documentation/devicetree/bindings/display/
 F:	Documentation/devicetree/bindings/gpu/
-F:	Documentation/devicetree/bindings/video/
 F:	Documentation/gpu/
 F:	include/drm/
 F:	include/uapi/drm/
@@ -4528,7 +4522,7 @@ M:	Boris Brezillon <boris.brezillon@...e-electrons.com>
 L:	dri-devel@...ts.freedesktop.org
 S:	Supported
 F:	drivers/gpu/drm/atmel-hlcdc/
-F:	Documentation/devicetree/bindings/drm/atmel/
+F:	Documentation/devicetree/bindings/mfd/atmel-hlcdc.txt
 T:	git git://anongit.freedesktop.org/drm/drm-misc
 
 DRM DRIVERS FOR BRIDGE CHIPS
@@ -4559,7 +4553,7 @@ 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
+F:	Documentation/devicetree/bindings/display/panel/nec,nl4827hc19-05b.txt
 
 DRM DRIVERS FOR FREESCALE IMX
 M:	Philipp Zabel <p.zabel@...gutronix.de>
@@ -5537,7 +5531,7 @@ M:	Madalin Bucur <madalin.bucur@....com>
 L:	netdev@...r.kernel.org
 S:	Maintained
 F:	drivers/net/ethernet/freescale/fman
-F:	Documentation/devicetree/bindings/powerpc/fsl/fman.txt
+F:	Documentation/devicetree/bindings/net/fsl-fman.txt
 
 FREESCALE QUAD SPI DRIVER
 M:	Han Xu <han.xu@....com>
@@ -5550,8 +5544,8 @@ M:	Qiang Zhao <qiang.zhao@....com>
 L:	linuxppc-dev@...ts.ozlabs.org
 S:	Maintained
 F:	drivers/soc/fsl/qe/
-F:	include/soc/fsl/*qe*.h
-F:	include/soc/fsl/*ucc*.h
+F:	include/soc/fsl/qe/*qe*.h
+F:	include/soc/fsl/qe/*ucc*.h
 
 FREESCALE QUICC ENGINE UCC ETHERNET DRIVER
 M:	Li Yang <leoyang.li@....com>
@@ -5922,7 +5916,7 @@ F:	drivers/staging/greybus/bootrom.c
 F:	drivers/staging/greybus/firmware.h
 F:	drivers/staging/greybus/fw-core.c
 F:	drivers/staging/greybus/fw-download.c
-F:	drivers/staging/greybus/fw-managament.c
+F:	drivers/staging/greybus/fw-management.c
 F:	drivers/staging/greybus/greybus_authentication.h
 F:	drivers/staging/greybus/greybus_firmware.h
 F:	drivers/staging/greybus/hid.c
@@ -5935,8 +5929,6 @@ GREYBUS LOOPBACK/TIME PROTOCOLS DRIVERS
 M:	Bryan O'Donoghue <pure.logic@...us-software.ie>
 S:	Maintained
 F:	drivers/staging/greybus/loopback.c
-F:	drivers/staging/greybus/timesync.c
-F:	drivers/staging/greybus/timesync_platform.c
 
 GREYBUS PLATFORM DRIVERS
 M:	Vaibhav Hiremath <hvaibhav.linux@...il.com>
@@ -6542,7 +6534,7 @@ F:	drivers/crypto/nx/nx-aes*
 F:	drivers/crypto/nx/nx-sha*
 F:	drivers/crypto/nx/nx.*
 F:	drivers/crypto/nx/nx_csbcpb.h
-F:	drivers/crypto/nx/nx_debugfs.h
+F:	drivers/crypto/nx/nx_debugfs.c
 
 IBM Power Linux RAID adapter
 M:	Brian King <brking@...ibm.com>
@@ -6563,7 +6555,6 @@ S:	Supported
 F:	arch/powerpc/platforms/powernv/vas*
 F:	arch/powerpc/platforms/powernv/copy-paste.h
 F:	arch/powerpc/include/asm/vas.h
-F:	arch/powerpc/include/uapi/asm/vas.h
 
 IBM Power Virtual Ethernet Device Driver
 M:	Thomas Falcon <tlfalcon@...ux.vnet.ibm.com>
@@ -6709,7 +6700,7 @@ IIO MULTIPLEXER
 M:	Peter Rosin <peda@...ntia.se>
 L:	linux-iio@...r.kernel.org
 S:	Maintained
-F:	Documentation/devicetree/bindings/iio/multiplexer/iio-mux.txt
+F:	Documentation/devicetree/bindings/iio/multiplexer/io-channel-mux.txt
 F:	drivers/iio/multiplexer/iio-mux.c
 
 IIO SUBSYSTEM AND DRIVERS
@@ -6753,7 +6744,7 @@ M:	Guenter Roeck <linux@...ck-us.net>
 L:	linux-hwmon@...r.kernel.org
 S:	Maintained
 F:	Documentation/hwmon/ina209
-F:	Documentation/devicetree/bindings/i2c/ina209.txt
+F:	Documentation/devicetree/bindings/hwmon/ina2xx.txt
 F:	drivers/hwmon/ina209.c
 
 INA2XX HARDWARE MONITOR DRIVER
@@ -7131,7 +7122,7 @@ M:	Linus Walleij <linus.walleij@...aro.org>
 L:	linux-iio@...r.kernel.org
 S:	Maintained
 F:	drivers/iio/gyro/mpu3050*
-F:	Documentation/devicetree/bindings/iio/gyroscope/inv,mpu3050.txt
+F:	Documentation/devicetree/bindings/iio/gyroscope/invensense,mpu3050.txt
 
 IOC3 ETHERNET DRIVER
 M:	Ralf Baechle <ralf@...ux-mips.org>
@@ -7652,7 +7643,6 @@ S:	Maintained
 F:	Documentation/security/keys/core.rst
 F:	include/linux/key.h
 F:	include/linux/key-type.h
-F:	include/linux/keyctl.h
 F:	include/uapi/linux/keyctl.h
 F:	include/keys/
 F:	security/keys/
@@ -8085,7 +8075,6 @@ F:	include/linux/spinlock*.h
 F:	arch/*/include/asm/spinlock*.h
 F:	include/linux/rwlock*.h
 F:	include/linux/mutex*.h
-F:	arch/*/include/asm/mutex*.h
 F:	include/linux/rwsem*.h
 F:	arch/*/include/asm/rwsem.h
 F:	include/linux/seqlock.h
@@ -8109,7 +8098,6 @@ L:	linux-scsi@...r.kernel.org
 W:	http://www.avagotech.com/support/
 S:	Supported
 F:	drivers/message/fusion/
-F:	drivers/scsi/mpt2sas/
 F:	drivers/scsi/mpt3sas/
 
 LSILOGIC/SYMBIOS/NCR 53C8XX and 53C1010 PCI-SCSI drivers
@@ -8335,7 +8323,7 @@ M:	Guenter Roeck <linux@...ck-us.net>
 L:	linux-hwmon@...r.kernel.org
 S:	Maintained
 F:	Documentation/hwmon/max20751
-F:	drivers/hwmon/max20751.c
+F:	drivers/hwmon/pmbus/max20751.c
 
 MAX2175 SDR TUNER DRIVER
 M:	Ramesh Shanmugasundaram <ramesh.shanmugasundaram@...renesas.com>
@@ -8358,7 +8346,7 @@ M:	Guenter Roeck <linux@...ck-us.net>
 L:	linux-hwmon@...r.kernel.org
 S:	Maintained
 F:	Documentation/hwmon/max6697
-F:	Documentation/devicetree/bindings/i2c/max6697.txt
+F:	Documentation/devicetree/bindings/hwmon/max6697.txt
 F:	drivers/hwmon/max6697.c
 F:	include/linux/platform_data/max6697.h
 
@@ -8669,7 +8657,7 @@ M:	Martin Donnelly <martin.donnelly@...com>
 M:	Martyn Welch <martyn.welch@...labora.co.uk>
 S:	Maintained
 F:	drivers/gpu/drm/bridge/megachips-stdpxxxx-ge-b850v3-fw.c
-F:	Documentation/devicetree/bindings/video/bridge/megachips-stdpxxxx-ge-b850v3-fw.txt
+F:	Documentation/devicetree/bindings/display/bridge/megachips-stdpxxxx-ge-b850v3-fw.txt
 
 MEGARAID SCSI/SAS DRIVERS
 M:	Kashyap Desai <kashyap.desai@...adcom.com>
@@ -8939,7 +8927,7 @@ L:	linux-media@...r.kernel.org
 S:	Supported
 F:	drivers/media/platform/atmel/atmel-isc.c
 F:	drivers/media/platform/atmel/atmel-isc-regs.h
-F:	devicetree/bindings/media/atmel-isc.txt
+F:	Documentation/devicetree/bindings/media/atmel-isc.txt
 
 MICROCHIP KSZ SERIES ETHERNET SWITCH DRIVER
 M:	Woojung Huh <Woojung.Huh@...rochip.com>
@@ -9193,9 +9181,9 @@ F:	include/uapi/linux/mmc/
 MULTIPLEXER SUBSYSTEM
 M:	Peter Rosin <peda@...ntia.se>
 S:	Maintained
-F:	Documentation/ABI/testing/mux/sysfs-class-mux*
+F:	Documentation/ABI/testing/sysfs-class-mux*
 F:	Documentation/devicetree/bindings/mux/
-F:	include/linux/dt-bindings/mux/
+F:	include/dt-bindings/mux
 F:	include/linux/mux/
 F:	drivers/mux/
 
@@ -9230,7 +9218,7 @@ MXSFB DRM DRIVER
 M:	Marek Vasut <marex@...x.de>
 S:	Supported
 F:	drivers/gpu/drm/mxsfb/
-F:	Documentation/devicetree/bindings/display/mxsfb-drm.txt
+F:	Documentation/devicetree/bindings/display/mxsfb.txt
 
 MYRICOM MYRI-10G 10GbE DRIVER (MYRI10GE)
 M:	Hyong-Youb Kim <hykim@...i.com>
@@ -10164,7 +10152,7 @@ M:	Willy Tarreau <willy@...roxy.com>
 M:	Ksenija Stanojevic <ksenija.stanojevic@...il.com>
 S:	Odd Fixes
 F:	Documentation/misc-devices/lcd-panel-cgram.txt
-F:	drivers/misc/panel.c
+F:	drivers/auxdisplay/panel.c
 
 PARALLEL PORT SUBSYSTEM
 M:	Sudip Mukherjee <sudipm.mukherjee@...il.com>
@@ -10482,7 +10470,7 @@ M:	Xiaowei Song <songxiaowei@...ilicon.com>
 M:	Binghui Wang <wangbinghui@...ilicon.com>
 L:	linux-pci@...r.kernel.org
 S:	Maintained
-F:	Documentation/devicetree/bindings/pci/pcie-kirin.txt
+F:	Documentation/devicetree/bindings/pci/kirin-pcie.txt
 F:	drivers/pci/dwc/pcie-kirin.c
 
 PCIE DRIVER FOR MEDIATEK
@@ -10934,7 +10922,6 @@ F:	include/uapi/linux/ptrace.h
 F:	include/uapi/linux/ptrace.h
 F:	include/asm-generic/ptrace.h
 F:	kernel/ptrace.c
-F:	arch/*/ptrace*.c
 F:	arch/*/*/ptrace*.c
 F:	arch/*/include/asm/ptrace*.h
 
@@ -11467,7 +11454,7 @@ RENESAS R-CAR GYROADC DRIVER
 M:	Marek Vasut <marek.vasut@...il.com>
 L:	linux-iio@...r.kernel.org
 S:	Supported
-F:	drivers/iio/adc/rcar_gyro_adc.c
+F:	drivers/iio/adc/rcar-gyroadc.c
 
 RENESAS USB PHY DRIVER
 M:	Yoshihiro Shimoda <yoshihiro.shimoda.uh@...esas.com>
@@ -11750,7 +11737,6 @@ T:	git git://linuxtv.org/media_tree.git
 S:	Maintained
 F:	drivers/media/common/saa7146/
 F:	drivers/media/pci/saa7146/
-F:	include/media/saa7146*
 
 SAMSUNG AUDIO (ASoC) DRIVERS
 M:	Krzysztof Kozlowski <krzk@...nel.org>
@@ -12341,7 +12327,6 @@ W:	http://www.rdrop.com/users/paulmck/RCU/
 S:	Supported
 T:	git git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git
 F:	include/linux/srcu.h
-F:	kernel/rcu/srcu.c
 
 SMACK SECURITY MODULE
 M:	Casey Schaufler <casey@...aufler-ca.com>
@@ -12510,7 +12495,7 @@ M:	Vinod Koul <vinod.koul@...el.com>
 L:	alsa-devel@...a-project.org (moderated for non-subscribers)
 T:	git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git
 S:	Supported
-F:	Documentation/sound/alsa/compress_offload.txt
+F:	Documentation/sound/designs/compress-offload.rst
 F:	include/sound/compress_driver.h
 F:	include/uapi/sound/compress_*
 F:	sound/core/compress_offload.c
@@ -12531,7 +12516,7 @@ L:	alsa-devel@...a-project.org (moderated for non-subscribers)
 W:	http://alsa-project.org/main/index.php/ASoC
 S:	Supported
 F:	Documentation/devicetree/bindings/sound/
-F:	Documentation/sound/alsa/soc/
+F:	Documentation/sound/soc/
 F:	sound/soc/
 F:	include/sound/soc*
 
@@ -12669,11 +12654,6 @@ M:	H Hartley Sweeten <hsweeten@...ionengravers.com>
 S:	Odd Fixes
 F:	drivers/staging/comedi/
 
-STAGING - FLARION FT1000 DRIVERS
-M:	Marek Belisko <marek.belisko@...il.com>
-S:	Odd Fixes
-F:	drivers/staging/ft1000/
-
 STAGING - INDUSTRIAL IO
 M:	Jonathan Cameron <jic23@...nel.org>
 L:	linux-iio@...r.kernel.org
@@ -12773,7 +12753,7 @@ F:	drivers/block/skd*[ch]
 STI CEC DRIVER
 M:	Benjamin Gaignard <benjamin.gaignard@...aro.org>
 S:	Maintained
-F:	drivers/staging/media/st-cec/
+F:	drivers/media/platform/sti/cec/
 F:	Documentation/devicetree/bindings/media/stih-cec.txt
 
 STK1160 USB VIDEO CAPTURE DRIVER
@@ -13235,7 +13215,6 @@ F:	Documentation/devicetree/bindings/arm/keystone/ti,sci.txt
 F:	drivers/firmware/ti_sci*
 F:	include/linux/soc/ti/ti_sci_protocol.h
 F:	Documentation/devicetree/bindings/soc/ti/sci-pm-domain.txt
-F:	include/dt-bindings/genpd/k2g.h
 F:	drivers/soc/ti/ti_sci_pm_domains.c
 F:	Documentation/devicetree/bindings/reset/ti,sci-reset.txt
 F:	Documentation/devicetree/bindings/clock/ti,sci-clk.txt
@@ -13756,7 +13735,7 @@ UDRAW TABLET
 M:	Bastien Nocera <hadess@...ess.net>
 L:	linux-input@...r.kernel.org
 S:	Maintained
-F:	drivers/hid/hid-udraw.c
+F:	drivers/hid/hid-udraw-ps3.c
 
 UFS FILESYSTEM
 M:	Evgeniy Dushistov <dushistov@...l.ru>
@@ -14058,7 +14037,7 @@ M:	Heikki Krogerus <heikki.krogerus@...ux.intel.com>
 L:	linux-usb@...r.kernel.org
 S:	Maintained
 F:	Documentation/ABI/testing/sysfs-class-typec
-F:	Documentation/usb/typec.rst
+F:	Documentation/driver-api/usb/typec.rst
 F:	drivers/usb/typec/
 F:	include/linux/usb/typec.h
 
@@ -14134,7 +14113,6 @@ F:	Documentation/virtual/uml/
 F:	arch/um/
 F:	arch/x86/um/
 F:	fs/hostfs/
-F:	fs/hppfs/
 
 USERSPACE I/O (UIO)
 M:	Greg Kroah-Hartman <gregkh@...uxfoundation.org>
@@ -14284,7 +14262,7 @@ F:	net/vmw_vsock/virtio_transport_common.c
 F:	net/vmw_vsock/virtio_transport.c
 F:	drivers/net/vsockmon.c
 F:	drivers/vhost/vsock.c
-F:	drivers/vhost/vsock.h
+F:	include/uapi/linux/vhost.h
 
 VIRTIO CONSOLE DRIVER
 M:	Amit Shah <amit@...nel.org>
@@ -14547,7 +14525,6 @@ L:	wil6210@....qualcomm.com
 S:	Supported
 W:	http://wireless.kernel.org/en/users/Drivers/wil6210
 F:	drivers/net/wireless/ath/wil6210/
-F:	include/uapi/linux/wil6210_uapi.h
 
 WIMAX STACK
 M:	Inaky Perez-Gonzalez <inaky.perez-gonzalez@...el.com>
@@ -14838,7 +14815,7 @@ YEALINK PHONE DRIVER
 M:	Henk Vergonet <Henk.Vergonet@...il.com>
 L:	usbb2k-api-dev@...gnu.org
 S:	Maintained
-F:	Documentation/input/yealink.rst
+F:	Documentation/input/devices/yealink.rst
 F:	drivers/input/misc/yealink.*
 
 Z8530 DRIVER FOR AX.25
-- 
2.14.3