Merge tag 'mips_4.16_2' of git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/mips
[sfrench/cifs-2.6.git] / MAINTAINERS
index ac100d3..a4dcdd3 100644 (file)
@@ -62,7 +62,15 @@ trivial patch so apply some common sense.
 
 7.     When sending security related changes or reports to a maintainer
        please Cc: security@kernel.org, especially if the maintainer
-       does not respond.
+       does not respond. Please keep in mind that the security team is
+       a small set of people who can be efficient only when working on
+       verified bugs. Please only Cc: this list when you have identified
+       that the bug would present a short-term risk to other users if it
+       were publicly disclosed. For example, reports of address leaks do
+       not represent an immediate threat and are better handled publicly,
+       and ideally, should come with a patch proposal. Please do not send
+       automated reports to this list either. Such bugs will be handled
+       better and faster in the usual public places.
 
 8.     Happy hacking.
 
@@ -262,6 +270,7 @@ ACCES 104-QUAD-8 IIO DRIVER
 M:     William Breathitt Gray <vilhelm.gray@gmail.com>
 L:     linux-iio@vger.kernel.org
 S:     Maintained
+F:     Documentation/ABI/testing/sysfs-bus-iio-counter-104-quad-8
 F:     drivers/iio/counter/104-quad-8.c
 
 ACCES PCI-IDIO-16 GPIO DRIVER
@@ -270,6 +279,12 @@ L: linux-gpio@vger.kernel.org
 S:     Maintained
 F:     drivers/gpio/gpio-pci-idio-16.c
 
+ACCES PCIe-IDIO-24 GPIO DRIVER
+M:     William Breathitt Gray <vilhelm.gray@gmail.com>
+L:     linux-gpio@vger.kernel.org
+S:     Maintained
+F:     drivers/gpio/gpio-pcie-idio-24.c
+
 ACENIC DRIVER
 M:     Jes Sorensen <jes@trained-monkey.org>
 L:     linux-acenic@sunsite.dk
@@ -321,7 +336,7 @@ F:  drivers/acpi/apei/
 
 ACPI COMPONENT ARCHITECTURE (ACPICA)
 M:     Robert Moore <robert.moore@intel.com>
-M:     Lv Zheng <lv.zheng@intel.com>
+M:     Erik Schmauss <erik.schmauss@intel.com>
 M:     "Rafael J. Wysocki" <rafael.j.wysocki@intel.com>
 L:     linux-acpi@vger.kernel.org
 L:     devel@acpica.org
@@ -845,6 +860,8 @@ M:  Michael Hennerich <Michael.Hennerich@analog.com>
 W:     http://wiki.analog.com/
 W:     http://ez.analog.com/community/linux-device-drivers
 S:     Supported
+F:     Documentation/ABI/testing/sysfs-bus-iio-frequency-ad9523
+F:     Documentation/ABI/testing/sysfs-bus-iio-frequency-adf4350
 F:     drivers/iio/*/ad*
 F:     drivers/iio/adc/ltc2497*
 X:     drivers/iio/*/adjd*
@@ -867,6 +884,12 @@ S: Supported
 F:     drivers/android/
 F:     drivers/staging/android/
 
+ANDROID GOLDFISH PIC DRIVER
+M:     Miodrag Dinic <miodrag.dinic@mips.com>
+S:     Supported
+F:     Documentation/devicetree/bindings/interrupt-controller/google,goldfish-pic.txt
+F:     drivers/irqchip/irq-goldfish-pic.c
+
 ANDROID GOLDFISH RTC DRIVER
 M:     Miodrag Dinic <miodrag.dinic@mips.com>
 S:     Supported
@@ -880,7 +903,6 @@ L:  devel@driverdev.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@sipsolutions.net>
@@ -1255,6 +1277,12 @@ L:       linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:     Supported
 F:     drivers/net/ethernet/cavium/thunder/
 
+ARM/CIRRUS LOGIC BK3 MACHINE SUPPORT
+M:     Lukasz Majewski <lukma@denx.de>
+L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
+S:     Maintained
+F:     arch/arm/mach-ep93xx/ts72xx.c
+
 ARM/CIRRUS LOGIC CLPS711X ARM ARCHITECTURE
 M:     Alexander Shiyan <shc_work@mail.ru>
 L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
@@ -1279,7 +1307,6 @@ M:        Russell King <linux@armlinux.org.uk>
 L:     linux-arm-kernel@lists.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
@@ -1313,7 +1340,8 @@ F:        tools/perf/arch/arm/util/pmu.c
 F:     tools/perf/arch/arm/util/auxtrace.c
 F:     tools/perf/arch/arm/util/cs-etm.c
 F:     tools/perf/arch/arm/util/cs-etm.h
-F:     tools/perf/util/cs-etm.h
+F:     tools/perf/util/cs-etm.*
+F:     tools/perf/util/cs-etm-decoder/*
 
 ARM/CORGI MACHINE SUPPORT
 M:     Richard Purdie <rpurdie@rpsys.net>
@@ -1327,8 +1355,10 @@ T:       git git://github.com/ulli-kroll/linux.git
 S:     Maintained
 F:     Documentation/devicetree/bindings/arm/gemini.txt
 F:     Documentation/devicetree/bindings/pinctrl/cortina,gemini-pinctrl.txt
+F:     Documentation/devicetree/bindings/net/cortina,gemini-ethernet.txt
 F:     Documentation/devicetree/bindings/rtc/faraday,ftrtc010.txt
 F:     arch/arm/mach-gemini/
+F:     drivers/net/ethernet/cortina/
 F:     drivers/pinctrl/pinctrl-gemini.c
 F:     drivers/rtc/rtc-ftrtc010.c
 
@@ -1583,6 +1613,7 @@ F:        arch/arm/boot/dts/kirkwood*
 F:     arch/arm/configs/mvebu_*_defconfig
 F:     arch/arm/mach-mvebu/
 F:     arch/arm64/boot/dts/marvell/armada*
+F:     drivers/cpufreq/armada-37xx-cpufreq.c
 F:     drivers/cpufreq/mvebu-cpufreq.c
 F:     drivers/irqchip/irq-armada-370-xp.c
 F:     drivers/irqchip/irq-mvebu-*
@@ -1635,14 +1666,38 @@ ARM/NEC MOBILEPRO 900/c MACHINE SUPPORT
 M:     Michael Petchkovsky <mkpetch@internode.on.net>
 S:     Maintained
 
-ARM/NOMADIK ARCHITECTURE
-M:     Alessandro Rubini <rubini@unipv.it>
+ARM/NOMADIK/U300/Ux500 ARCHITECTURES
 M:     Linus Walleij <linus.walleij@linaro.org>
 L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:     Maintained
 F:     arch/arm/mach-nomadik/
-F:     drivers/pinctrl/nomadik/
+F:     arch/arm/mach-u300/
+F:     arch/arm/mach-ux500/
+F:     arch/arm/boot/dts/ste-*
+F:     drivers/clk/clk-nomadik.c
+F:     drivers/clk/clk-u300.c
+F:     drivers/clocksource/clksrc-dbx500-prcmu.c
+F:     drivers/clocksource/timer-u300.c
+F:     drivers/dma/coh901318*
+F:     drivers/dma/ste_dma40*
+F:     drivers/hwspinlock/u8500_hsem.c
 F:     drivers/i2c/busses/i2c-nomadik.c
+F:     drivers/i2c/busses/i2c-stu300.c
+F:     drivers/mfd/ab3100*
+F:     drivers/mfd/ab8500*
+F:     drivers/mfd/abx500*
+F:     drivers/mfd/dbx500*
+F:     drivers/mfd/db8500*
+F:     drivers/pinctrl/nomadik/
+F:     drivers/pinctrl/pinctrl-coh901*
+F:     drivers/pinctrl/pinctrl-u300.c
+F:     drivers/rtc/rtc-ab3100.c
+F:     drivers/rtc/rtc-ab8500.c
+F:     drivers/rtc/rtc-coh901331.c
+F:     drivers/rtc/rtc-pl031.c
+F:     drivers/watchdog/coh901327_wdt.c
+F:     Documentation/devicetree/bindings/arm/ste-*
+F:     Documentation/devicetree/bindings/arm/ux500/
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-nomadik.git
 
 ARM/NUVOTON W90X900 ARM ARCHITECTURE
@@ -1680,9 +1735,7 @@ L:        linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 L:     linux-oxnas@lists.tuxfamily.org (moderated for non-subscribers)
 S:     Maintained
 F:     arch/arm/mach-oxnas/
-F:     arch/arm/boot/dts/ox8*.dtsi
-F:     arch/arm/boot/dts/wd-mbwe.dts
-F:     arch/arm/boot/dts/cloudengines-pogoplug-series-3.dts
+F:     arch/arm/boot/dts/ox8*.dts*
 N:     oxnas
 
 ARM/PALM TREO SUPPORT
@@ -1690,8 +1743,7 @@ M:        Tomas Cech <sleep_walker@suse.com>
 L:     linux-arm-kernel@lists.infradead.org
 W:     http://hackndev.com
 S:     Maintained
-F:     arch/arm/mach-pxa/include/mach/palmtreo.h
-F:     arch/arm/mach-pxa/palmtreo.c
+F:     arch/arm/mach-pxa/palmtreo.*
 
 ARM/PALMTX,PALMT5,PALMLD,PALMTE2,PALMTC SUPPORT
 M:     Marek Vasut <marek.vasut@gmail.com>
@@ -1700,12 +1752,10 @@ 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.c
+F:     arch/arm/mach-pxa/palmt5.*
 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.c
+F:     arch/arm/mach-pxa/palmte2.*
 F:     arch/arm/mach-pxa/include/mach/palmtc.h
 F:     arch/arm/mach-pxa/palmtc.c
 
@@ -1714,8 +1764,7 @@ M:        Sergey Lapin <slapin@ossfans.org>
 L:     linux-arm-kernel@lists.infradead.org
 W:     http://hackndev.com
 S:     Maintained
-F:     arch/arm/mach-pxa/include/mach/palmz72.h
-F:     arch/arm/mach-pxa/palmz72.c
+F:     arch/arm/mach-pxa/palmz72.*
 
 ARM/PLEB SUPPORT
 M:     Peter Chubb <pleb@gelato.unsw.edu.au>
@@ -1744,7 +1793,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
@@ -1956,9 +2004,10 @@ N:       stm32
 F:     drivers/clocksource/armv7m_systick.c
 
 ARM/TANGO ARCHITECTURE
-M:     Marc Gonzalez <marc_gonzalez@sigmadesigns.com>
+M:     Marc Gonzalez <marc.w.gonzalez@free.fr>
+M:     Mans Rullgard <mans@mansr.com>
 L:     linux-arm-kernel@lists.infradead.org
-S:     Maintained
+S:     Odd Fixes
 N:     tango
 
 ARM/TECHNOLOGIC SYSTEMS TS7250 MACHINE SUPPORT
@@ -2022,27 +2071,13 @@ M:      Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
 M:     Dirk Opfer <dirk@opfer-online.de>
 S:     Maintained
 
-ARM/U300 MACHINE SUPPORT
-M:     Linus Walleij <linus.walleij@linaro.org>
-L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
-S:     Supported
-F:     arch/arm/mach-u300/
-F:     drivers/clocksource/timer-u300.c
-F:     drivers/i2c/busses/i2c-stu300.c
-F:     drivers/rtc/rtc-coh901331.c
-F:     drivers/watchdog/coh901327_wdt.c
-F:     drivers/dma/coh901318*
-F:     drivers/mfd/ab3100*
-F:     drivers/rtc/rtc-ab3100.c
-F:     drivers/rtc/rtc-coh901331.c
-T:     git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson.git
-
 ARM/UNIPHIER ARCHITECTURE
 M:     Masahiro Yamada <yamada.masahiro@socionext.com>
 L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-uniphier.git
 S:     Maintained
 F:     Documentation/devicetree/bindings/gpio/gpio-uniphier.txt
+F:     Documentation/devicetree/bindings/pinctrl/socionext,uniphier-pinctrl.txt
 F:     arch/arm/boot/dts/uniphier*
 F:     arch/arm/include/asm/hardware/cache-uniphier.h
 F:     arch/arm/mach-uniphier/
@@ -2058,24 +2093,6 @@ F:       drivers/reset/reset-uniphier.c
 F:     drivers/tty/serial/8250/8250_uniphier.c
 N:     uniphier
 
-ARM/Ux500 ARM ARCHITECTURE
-M:     Linus Walleij <linus.walleij@linaro.org>
-L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
-S:     Maintained
-F:     arch/arm/mach-ux500/
-F:     drivers/clocksource/clksrc-dbx500-prcmu.c
-F:     drivers/dma/ste_dma40*
-F:     drivers/hwspinlock/u8500_hsem.c
-F:     drivers/mfd/abx500*
-F:     drivers/mfd/ab8500*
-F:     drivers/mfd/dbx500*
-F:     drivers/mfd/db8500*
-F:     drivers/pinctrl/nomadik/pinctrl-ab*
-F:     drivers/pinctrl/nomadik/pinctrl-nomadik*
-F:     drivers/rtc/rtc-ab8500.c
-F:     drivers/rtc/rtc-pl031.c
-T:     git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson.git
-
 ARM/Ux500 CLOCK FRAMEWORK SUPPORT
 M:     Ulf Hansson <ulf.hansson@linaro.org>
 L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
@@ -2202,14 +2219,6 @@ L:       linux-leds@vger.kernel.org
 S:     Maintained
 F:     drivers/leds/leds-as3645a.c
 
-AS3645A LED FLASH CONTROLLER DRIVER
-M:     Laurent Pinchart <laurent.pinchart@ideasonboard.com>
-L:     linux-media@vger.kernel.org
-T:     git git://linuxtv.org/media_tree.git
-S:     Maintained
-F:     drivers/media/i2c/as3645a.c
-F:     include/media/i2c/as3645a.h
-
 ASAHI KASEI AK8974 DRIVER
 M:     Linus Walleij <linus.walleij@linaro.org>
 L:     linux-iio@vger.kernel.org
@@ -2262,7 +2271,9 @@ F:        include/linux/async_tx.h
 AT24 EEPROM DRIVER
 M:     Bartosz Golaszewski <brgl@bgdev.pl>
 L:     linux-i2c@vger.kernel.org
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git
 S:     Maintained
+F:     Documentation/devicetree/bindings/eeprom/at24.txt
 F:     drivers/misc/eeprom/at24.c
 F:     include/linux/platform_data/at24.h
 
@@ -2383,13 +2394,6 @@ F:       Documentation/devicetree/bindings/input/atmel,maxtouch.txt
 F:     drivers/input/touchscreen/atmel_mxt_ts.c
 F:     include/linux/platform_data/atmel_mxt_ts.h
 
-ATMEL NAND DRIVER
-M:     Wenyou Yang <wenyou.yang@atmel.com>
-M:     Josh Wu <rainyfeeling@outlook.com>
-L:     linux-mtd@lists.infradead.org
-S:     Supported
-F:     drivers/mtd/nand/atmel/*
-
 ATMEL SAMA5D2 ADC DRIVER
 M:     Ludovic Desroches <ludovic.desroches@microchip.com>
 L:     linux-iio@vger.kernel.org
@@ -2501,6 +2505,8 @@ L:        linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:     Maintained
 F:     Documentation/devicetree/bindings/arm/axentia.txt
 F:     arch/arm/boot/dts/at91-linea.dtsi
+F:     arch/arm/boot/dts/at91-natte.dtsi
+F:     arch/arm/boot/dts/at91-nattis-2-natte-2.dts
 F:     arch/arm/boot/dts/at91-tse850-3.dts
 
 AXENTIA ASOC DRIVERS
@@ -2564,6 +2570,7 @@ S:        Maintained
 F:     Documentation/ABI/testing/sysfs-class-net-batman-adv
 F:     Documentation/ABI/testing/sysfs-class-net-mesh
 F:     Documentation/networking/batman-adv.rst
+F:     include/uapi/linux/batadv_packet.h
 F:     include/uapi/linux/batman_adv.h
 F:     net/batman-adv/
 
@@ -2621,24 +2628,22 @@ F:      fs/bfs/
 F:     include/uapi/linux/bfs_fs.h
 
 BLACKFIN ARCHITECTURE
-M:     Steven Miao <realmz6@gmail.com>
 L:     adi-buildroot-devel@lists.sourceforge.net (moderated for non-subscribers)
 T:     git git://git.code.sf.net/p/adi-linux/code
 W:     http://blackfin.uclinux.org
-S:     Supported
+S:     Orphan
 F:     arch/blackfin/
 
 BLACKFIN EMAC DRIVER
 L:     adi-buildroot-devel@lists.sourceforge.net (moderated for non-subscribers)
 W:     http://blackfin.uclinux.org
-S:     Supported
+S:     Orphan
 F:     drivers/net/ethernet/adi/
 
 BLACKFIN MEDIA DRIVER
-M:     Scott Jiang <scott.jiang.linux@gmail.com>
 L:     adi-buildroot-devel@lists.sourceforge.net (moderated for non-subscribers)
 W:     http://blackfin.uclinux.org/
-S:     Supported
+S:     Orphan
 F:     drivers/media/platform/blackfin/
 F:     drivers/media/i2c/adv7183*
 F:     drivers/media/i2c/vs6624*
@@ -2646,25 +2651,25 @@ F:      drivers/media/i2c/vs6624*
 BLACKFIN RTC DRIVER
 L:     adi-buildroot-devel@lists.sourceforge.net (moderated for non-subscribers)
 W:     http://blackfin.uclinux.org
-S:     Supported
+S:     Orphan
 F:     drivers/rtc/rtc-bfin.c
 
 BLACKFIN SDH DRIVER
 L:     adi-buildroot-devel@lists.sourceforge.net (moderated for non-subscribers)
 W:     http://blackfin.uclinux.org
-S:     Supported
+S:     Orphan
 F:     drivers/mmc/host/bfin_sdh.c
 
 BLACKFIN SERIAL DRIVER
 L:     adi-buildroot-devel@lists.sourceforge.net (moderated for non-subscribers)
 W:     http://blackfin.uclinux.org
-S:     Supported
+S:     Orphan
 F:     drivers/tty/serial/bfin_uart.c
 
 BLACKFIN WATCHDOG DRIVER
 L:     adi-buildroot-devel@lists.sourceforge.net (moderated for non-subscribers)
 W:     http://blackfin.uclinux.org
-S:     Supported
+S:     Orphan
 F:     drivers/watchdog/bfin_wdt.c
 
 BLINKM RGB LED DRIVER
@@ -2689,7 +2694,6 @@ F:        drivers/mtd/devices/block2mtd.c
 
 BLUETOOTH DRIVERS
 M:     Marcel Holtmann <marcel@holtmann.org>
-M:     Gustavo Padovan <gustavo@padovan.org>
 M:     Johan Hedberg <johan.hedberg@gmail.com>
 L:     linux-bluetooth@vger.kernel.org
 W:     http://www.bluez.org/
@@ -2700,7 +2704,6 @@ F:        drivers/bluetooth/
 
 BLUETOOTH SUBSYSTEM
 M:     Marcel Holtmann <marcel@holtmann.org>
-M:     Gustavo Padovan <gustavo@padovan.org>
 M:     Johan Hedberg <johan.hedberg@gmail.com>
 L:     linux-bluetooth@vger.kernel.org
 W:     http://www.bluez.org/
@@ -2725,12 +2728,16 @@ M:      Alexei Starovoitov <ast@kernel.org>
 M:     Daniel Borkmann <daniel@iogearbox.net>
 L:     netdev@vger.kernel.org
 L:     linux-kernel@vger.kernel.org
+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
 S:     Supported
 F:     arch/x86/net/bpf_jit*
 F:     Documentation/networking/filter.txt
 F:     Documentation/bpf/
 F:     include/linux/bpf*
 F:     include/linux/filter.h
+F:     include/trace/events/bpf.h
+F:     include/trace/events/xdp.h
 F:     include/uapi/linux/bpf*
 F:     include/uapi/linux/filter.h
 F:     kernel/bpf/
@@ -2834,6 +2841,8 @@ S:        Maintained
 F:     arch/arm/mach-bcm/*brcmstb*
 F:     arch/arm/boot/dts/bcm7*.dts*
 F:     drivers/bus/brcmstb_gisb.c
+F:     arch/arm/mm/cache-b15-rac.c
+F:     arch/arm/include/asm/hardware/cache-b15-rac.h
 N:     brcmstb
 
 BROADCOM BMIPS CPUFREQ DRIVER
@@ -3195,7 +3204,7 @@ W:        https://github.com/linux-can
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can.git
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can-next.git
 S:     Maintained
-F:     Documentation/networking/can.txt
+F:     Documentation/networking/can.rst
 F:     net/can/
 F:     include/linux/can/core.h
 F:     include/uapi/linux/can.h
@@ -3400,8 +3409,8 @@ M:        Arnd Bergmann <arnd@arndb.de>
 M:     Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git
 S:     Supported
-F:     drivers/char/*
-F:     drivers/misc/*
+F:     drivers/char/
+F:     drivers/misc/
 F:     include/linux/miscdevice.h
 
 CHECKPATCH
@@ -3549,7 +3558,7 @@ F:        drivers/media/platform/coda/
 
 COMMON CLK FRAMEWORK
 M:     Michael Turquette <mturquette@baylibre.com>
-M:     Stephen Boyd <sboyd@codeaurora.org>
+M:     Stephen Boyd <sboyd@kernel.org>
 L:     linux-clk@vger.kernel.org
 Q:     http://patchwork.kernel.org/project/linux-clk/list/
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git
@@ -4127,6 +4136,7 @@ DEVANTECH SRF ULTRASONIC RANGER IIO DRIVER
 M:     Andreas Klinger <ak@it-klinger.de>
 L:     linux-iio@vger.kernel.org
 S:     Maintained
+F:     Documentation/ABI/testing/sysfs-bus-iio-distance-srf08
 F:     drivers/iio/proximity/srf*.c
 
 DEVICE COREDUMP (DEV_COREDUMP)
@@ -4336,10 +4346,12 @@ T:      git git://git.infradead.org/users/hch/dma-mapping.git
 W:     http://git.infradead.org/users/hch/dma-mapping.git
 S:     Supported
 F:     lib/dma-debug.c
-F:     lib/dma-noop.c
+F:     lib/dma-direct.c
 F:     lib/dma-virt.c
 F:     drivers/base/dma-mapping.c
 F:     drivers/base/dma-coherent.c
+F:     include/asm-generic/dma-mapping.h
+F:     include/linux/dma-direct.h
 F:     include/linux/dma-mapping.h
 
 DME1737 HARDWARE MONITOR DRIVER
@@ -4462,6 +4474,12 @@ T:       git git://anongit.freedesktop.org/drm/drm-misc
 S:     Maintained
 F:     drivers/gpu/drm/tve200/
 
+DRM DRIVER FOR ILITEK ILI9225 PANELS
+M:     David Lechner <david@lechnology.com>
+S:     Maintained
+F:     drivers/gpu/drm/tinydrm/ili9225.c
+F:     Documentation/devicetree/bindings/display/ili9225.txt
+
 DRM DRIVER FOR INTEL I810 VIDEO CARDS
 S:     Orphan / Obsolete
 F:     drivers/gpu/drm/i810/
@@ -4548,6 +4566,12 @@ S:       Maintained
 F:     drivers/gpu/drm/tinydrm/st7586.c
 F:     Documentation/devicetree/bindings/display/st7586.txt
 
+DRM DRIVER FOR SITRONIX ST7735R PANELS
+M:     David Lechner <david@lechnology.com>
+S:     Maintained
+F:     drivers/gpu/drm/tinydrm/st7735r.c
+F:     Documentation/devicetree/bindings/display/st7735r.txt
+
 DRM DRIVER FOR TDFX VIDEO CARDS
 S:     Orphan / Obsolete
 F:     drivers/gpu/drm/tdfx/
@@ -4587,7 +4611,7 @@ F:        include/linux/vga*
 
 DRM DRIVERS AND MISC GPU PATCHES
 M:     Daniel Vetter <daniel.vetter@intel.com>
-M:     Jani Nikula <jani.nikula@linux.intel.com>
+M:     Gustavo Padovan <gustavo@padovan.org>
 M:     Sean Paul <seanpaul@chromium.org>
 W:     https://01.org/linuxgraphics/gfx-docs/maintainer-tools/drm-misc.html
 S:     Maintained
@@ -4716,7 +4740,8 @@ F:        Documentation/devicetree/bindings/display/bridge/renesas,dw-hdmi.txt
 F:     Documentation/devicetree/bindings/display/renesas,du.txt
 
 DRM DRIVERS FOR ROCKCHIP
-M:     Mark Yao <mark.yao@rock-chips.com>
+M:     Sandy Huang <hjc@rock-chips.com>
+M:     Heiko Stübner <heiko@sntech.de>
 L:     dri-devel@lists.freedesktop.org
 S:     Maintained
 F:     drivers/gpu/drm/rockchip/
@@ -4804,6 +4829,15 @@ S:       Maintained
 F:     drivers/gpu/drm/tinydrm/
 F:     include/drm/tinydrm/
 
+DRM TTM SUBSYSTEM
+M:     Christian Koenig <christian.koenig@amd.com>
+M:     Roger He <Hongbo.He@amd.com>
+T:     git git://people.freedesktop.org/~agd5f/linux
+S:     Maintained
+L:     dri-devel@lists.freedesktop.org
+F:     include/drm/ttm/
+F:     drivers/gpu/drm/ttm/
+
 DSBR100 USB FM RADIO DRIVER
 M:     Alexey Klimov <klimov.linux@gmail.com>
 L:     linux-media@vger.kernel.org
@@ -4941,6 +4975,11 @@ S:       Maintained
 F:     lib/dynamic_debug.c
 F:     include/linux/dynamic_debug.h
 
+DYNAMIC INTERRUPT MODERATION
+M:     Tal Gilboa <talgi@mellanox.com>
+S:     Maintained
+F:     include/linux/net_dim.h
+
 DZ DECSTATION DZ11 SERIAL DRIVER
 M:     "Maciej W. Rozycki" <macro@linux-mips.org>
 S:     Maintained
@@ -5141,6 +5180,12 @@ L:       linux-edac@vger.kernel.org
 S:     Maintained
 F:     drivers/edac/skx_edac.c
 
+EDAC-TI
+M:     Tero Kristo <t-kristo@ti.com>
+L:     linux-edac@vger.kernel.org
+S:     Maintained
+F:     drivers/edac/ti_edac.c
+
 EDIROL UA-101/UA-1000 DRIVER
 M:     Clemens Ladisch <clemens@ladisch.de>
 L:     alsa-devel@alsa-project.org (moderated for non-subscribers)
@@ -5151,15 +5196,15 @@ F:      sound/usb/misc/ua101.c
 EFI TEST DRIVER
 L:     linux-efi@vger.kernel.org
 M:     Ivan Hu <ivan.hu@canonical.com>
-M:     Matt Fleming <matt@codeblueprint.co.uk>
+M:     Ard Biesheuvel <ard.biesheuvel@linaro.org>
 S:     Maintained
 F:     drivers/firmware/efi/test/
 
 EFI VARIABLE FILESYSTEM
 M:     Matthew Garrett <matthew.garrett@nebula.com>
 M:     Jeremy Kerr <jk@ozlabs.org>
-M:     Matt Fleming <matt@codeblueprint.co.uk>
-T:     git git://git.kernel.org/pub/scm/linux/kernel/git/mfleming/efi.git
+M:     Ard Biesheuvel <ard.biesheuvel@linaro.org>
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git
 L:     linux-efi@vger.kernel.org
 S:     Maintained
 F:     fs/efivarfs/
@@ -5320,7 +5365,6 @@ S:        Supported
 F:     security/integrity/evm/
 
 EXTENSIBLE FIRMWARE INTERFACE (EFI)
-M:     Matt Fleming <matt@codeblueprint.co.uk>
 M:     Ard Biesheuvel <ard.biesheuvel@linaro.org>
 L:     linux-efi@vger.kernel.org
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git
@@ -5431,7 +5475,7 @@ F:        drivers/media/tuners/fc2580*
 
 FCOE SUBSYSTEM (libfc, libfcoe, fcoe)
 M:     Johannes Thumshirn <jth@kernel.org>
-L:     fcoe-devel@open-fcoe.org
+L:     linux-scsi@vger.kernel.org
 W:     www.Open-FCoE.org
 S:     Supported
 F:     drivers/scsi/libfc/
@@ -5948,6 +5992,12 @@ L:       linux-input@vger.kernel.org
 S:     Maintained
 F:     drivers/input/touchscreen/goodix.c
 
+GPD POCKET FAN DRIVER
+M:     Hans de Goede <hdegoede@redhat.com>
+L:     platform-driver-x86@vger.kernel.org
+S:     Maintained
+F:     drivers/platform/x86/gpd-pocket-fan.c
+
 GPIO ACPI SUPPORT
 M:     Mika Westerberg <mika.westerberg@linux.intel.com>
 M:     Andy Shevchenko <andriy.shevchenko@linux.intel.com>
@@ -5965,6 +6015,7 @@ F:        drivers/media/rc/gpio-ir-tx.c
 
 GPIO MOCKUP DRIVER
 M:     Bamvor Jian Zhang <bamvor.zhangjian@linaro.org>
+R:     Bartosz Golaszewski <brgl@bgdev.pl>
 L:     linux-gpio@vger.kernel.org
 S:     Maintained
 F:     drivers/gpio/gpio-mockup.c
@@ -6520,6 +6571,12 @@ F:       drivers/i2c/i2c-mux.c
 F:     drivers/i2c/muxes/
 F:     include/linux/i2c-mux.h
 
+I2C MV64XXX MARVELL AND ALLWINNER DRIVER
+M:     Gregory CLEMENT <gregory.clement@free-electrons.com>
+L:     linux-i2c@vger.kernel.org
+S:     Maintained
+F:     drivers/i2c/busses/i2c-mv64xxx.c
+
 I2C OVER PARALLEL PORT
 M:     Jean Delvare <jdelvare@suse.com>
 L:     linux-i2c@vger.kernel.org
@@ -6612,16 +6669,6 @@ L:       linux-i2c@vger.kernel.org
 S:     Maintained
 F:     drivers/i2c/i2c-stub.c
 
-i386 BOOT CODE
-M:     "H. Peter Anvin" <hpa@zytor.com>
-S:     Maintained
-F:     arch/x86/boot/
-
-i386 SETUP CODE / CPU ERRATA WORKAROUNDS
-M:     "H. Peter Anvin" <hpa@zytor.com>
-T:     git git://git.kernel.org/pub/scm/linux/kernel/git/hpa/linux-2.6-x86setup.git
-S:     Maintained
-
 IA64 (Itanium) PLATFORM
 M:     Tony Luck <tony.luck@intel.com>
 M:     Fenghua Yu <fenghua.yu@intel.com>
@@ -6829,6 +6876,8 @@ R:        Peter Meerwald-Stadler <pmeerw@pmeerw.net>
 L:     linux-iio@vger.kernel.org
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git
 S:     Maintained
+F:     Documentation/ABI/testing/configfs-iio*
+F:     Documentation/ABI/testing/sysfs-bus-iio*
 F:     Documentation/devicetree/bindings/iio/
 F:     drivers/iio/
 F:     drivers/staging/iio/
@@ -6886,9 +6935,9 @@ INFINIBAND SUBSYSTEM
 M:     Doug Ledford <dledford@redhat.com>
 M:     Jason Gunthorpe <jgg@mellanox.com>
 L:     linux-rdma@vger.kernel.org
-W:     http://www.openfabrics.org/
+W:     https://github.com/linux-rdma/rdma-core
 Q:     http://patchwork.kernel.org/project/linux-rdma/list/
-T:     git git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma.git
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git
 S:     Supported
 F:     Documentation/devicetree/bindings/infiniband/
 F:     Documentation/infiniband/
@@ -7029,7 +7078,7 @@ M:        Zhi Wang <zhi.a.wang@intel.com>
 L:     intel-gvt-dev@lists.freedesktop.org
 L:     intel-gfx@lists.freedesktop.org
 W:     https://01.org/igvt-g
-T:     git https://github.com/01org/gvt-linux.git
+T:     git https://github.com/intel/gvt-linux.git
 S:     Supported
 F:     drivers/gpu/drm/i915/gvt/
 
@@ -7076,6 +7125,14 @@ R:       Dan Williams <dan.j.williams@intel.com>
 S:     Odd fixes
 F:     drivers/dma/iop-adma.c
 
+INTEL IPU3 CSI-2 CIO2 DRIVER
+M:     Yong Zhi <yong.zhi@intel.com>
+M:     Sakari Ailus <sakari.ailus@linux.intel.com>
+L:     linux-media@vger.kernel.org
+S:     Maintained
+F:     drivers/media/pci/intel/ipu3/
+F:     Documentation/media/uapi/v4l/pixfmt-srggb10-ipu3.rst
+
 INTEL IXP4XX QMGR, NPE, ETHERNET and HSS SUPPORT
 M:     Krzysztof Halasa <khalasa@piap.pl>
 S:     Maintained
@@ -7310,17 +7367,16 @@ F:      drivers/tty/ipwireless/
 
 IPX NETWORK LAYER
 L:     netdev@vger.kernel.org
-S:     Odd fixes
-F:     include/net/ipx.h
+S:     Obsolete
 F:     include/uapi/linux/ipx.h
-F:     net/ipx/
+F:     drivers/staging/ipx/
 
 IRDA SUBSYSTEM
 M:     Samuel Ortiz <samuel@sortiz.org>
 L:     irda-users@lists.sourceforge.net (subscribers-only)
 L:     netdev@vger.kernel.org
 W:     http://irda.sourceforge.net/
-S:     Maintained
+S:     Obsolete
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/sameo/irda-2.6.git
 F:     Documentation/networking/irda.txt
 F:     drivers/staging/irda/
@@ -7692,7 +7748,9 @@ F:        arch/powerpc/kernel/kvm*
 
 KERNEL VIRTUAL MACHINE for s390 (KVM/s390)
 M:     Christian Borntraeger <borntraeger@de.ibm.com>
-M:     Cornelia Huck <cohuck@redhat.com>
+M:     Janosch Frank <frankja@linux.vnet.ibm.com>
+R:     David Hildenbrand <david@redhat.com>
+R:     Cornelia Huck <cohuck@redhat.com>
 L:     linux-s390@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
@@ -7744,6 +7802,7 @@ F:        include/keys/encrypted-type.h
 F:     security/keys/encrypted-keys/
 
 KEYS-TRUSTED
+M:     James Bottomley <jejb@linux.vnet.ibm.com>
 M:     Mimi Zohar <zohar@linux.vnet.ibm.com>
 L:     linux-integrity@vger.kernel.org
 L:     keyrings@vger.kernel.org
@@ -8195,6 +8254,7 @@ F:        arch/*/include/asm/rwsem.h
 F:     include/linux/seqlock.h
 F:     lib/locking*.[ch]
 F:     kernel/locking/
+X:     kernel/locking/locktorture.c
 
 LOGICAL DISK MANAGER SUPPORT (LDM, Windows 2000/XP/Vista Dynamic Disks)
 M:     "Richard Russon (FlatCap)" <ldm@flatcap.org>
@@ -8410,6 +8470,13 @@ L:       linux-wireless@vger.kernel.org
 S:     Odd Fixes
 F:     drivers/net/wireless/marvell/mwl8k.c
 
+MARVELL NAND CONTROLLER DRIVER
+M:     Miquel Raynal <miquel.raynal@free-electrons.com>
+L:     linux-mtd@lists.infradead.org
+S:     Maintained
+F:     drivers/mtd/nand/marvell_nand.c
+F:     Documentation/devicetree/bindings/mtd/marvell-nand.txt
+
 MARVELL SOC MMC/SD/SDIO CONTROLLER DRIVER
 M:     Nicolas Pitre <nico@fluxnic.net>
 S:     Odd Fixes
@@ -8681,6 +8748,15 @@ T:       git git://linuxtv.org/media_tree.git
 S:     Maintained
 F:     drivers/media/dvb-frontends/stv6111*
 
+MEDIA DRIVERS FOR NVIDIA TEGRA - VDE
+M:     Dmitry Osipenko <digetx@gmail.com>
+L:     linux-media@vger.kernel.org
+L:     linux-tegra@vger.kernel.org
+T:     git git://linuxtv.org/media_tree.git
+S:     Maintained
+F:     Documentation/devicetree/bindings/media/nvidia,tegra-vde.txt
+F:     drivers/staging/media/tegra-vde/
+
 MEDIA INPUT INFRASTRUCTURE (V4L/DVB)
 M:     Mauro Carvalho Chehab <mchehab@s-opensource.com>
 M:     Mauro Carvalho Chehab <mchehab@kernel.org>
@@ -8724,6 +8800,13 @@ L:       netdev@vger.kernel.org
 S:     Maintained
 F:     drivers/net/ethernet/mediatek/
 
+MEDIATEK SWITCH DRIVER
+M:     Sean Wang <sean.wang@mediatek.com>
+L:     netdev@vger.kernel.org
+S:     Maintained
+F:     drivers/net/dsa/mt7530.*
+F:     net/dsa/tag_mtk.c
+
 MEDIATEK JPEG DRIVER
 M:     Rick Chang <rick.chang@mediatek.com>
 M:     Bin Liu <bin.liu@mediatek.com>
@@ -8855,12 +8938,13 @@ W:      http://www.mellanox.com
 Q:     http://patchwork.ozlabs.org/project/netdev/list/
 F:     drivers/net/ethernet/mellanox/mlxfw/
 
-MELLANOX MLX CPLD HOTPLUG DRIVER
+MELLANOX HARDWARE PLATFORM SUPPORT
+M:     Andy Shevchenko <andy@infradead.org>
+M:     Darren Hart <dvhart@infradead.org>
 M:     Vadim Pasternak <vadimp@mellanox.com>
 L:     platform-driver-x86@vger.kernel.org
 S:     Supported
-F:     drivers/platform/x86/mlxcpld-hotplug.c
-F:     include/linux/platform_data/mlxcpld-hotplug.h
+F:     drivers/platform/mellanox/
 
 MELLANOX MLX4 core VPI driver
 M:     Tariq Toukan <tariqt@mellanox.com>
@@ -8934,6 +9018,7 @@ L:        linux-kernel@vger.kernel.org
 S:     Supported
 F:     kernel/sched/membarrier.c
 F:     include/uapi/linux/membarrier.h
+F:     arch/powerpc/include/asm/membarrier.h
 
 MEMORY MANAGEMENT
 L:     linux-mm@kvack.org
@@ -8957,7 +9042,7 @@ L:        linux-mtd@lists.infradead.org
 W:     http://www.linux-mtd.infradead.org/
 Q:     http://patchwork.ozlabs.org/project/linux-mtd/list/
 T:     git git://git.infradead.org/linux-mtd.git master
-T:     git git://git.infradead.org/l2-mtd.git master
+T:     git git://git.infradead.org/linux-mtd.git mtd/next
 S:     Maintained
 F:     Documentation/devicetree/bindings/mtd/
 F:     drivers/mtd/
@@ -9046,6 +9131,14 @@ F:       drivers/media/platform/atmel/atmel-isc.c
 F:     drivers/media/platform/atmel/atmel-isc-regs.h
 F:     devicetree/bindings/media/atmel-isc.txt
 
+MICROCHIP / ATMEL NAND DRIVER
+M:     Wenyou Yang <wenyou.yang@microchip.com>
+M:     Josh Wu <rainyfeeling@outlook.com>
+L:     linux-mtd@lists.infradead.org
+S:     Supported
+F:     drivers/mtd/nand/atmel/*
+F:     Documentation/devicetree/bindings/mtd/atmel-nand.txt
+
 MICROCHIP KSZ SERIES ETHERNET SWITCH DRIVER
 M:     Woojung Huh <Woojung.Huh@microchip.com>
 M:     Microchip Linux Driver Support <UNGLinuxDriver@microchip.com>
@@ -9088,6 +9181,7 @@ F:        drivers/usb/image/microtek.*
 
 MIPS
 M:     Ralf Baechle <ralf@linux-mips.org>
+M:     James Hogan <jhogan@kernel.org>
 L:     linux-mips@linux-mips.org
 W:     http://www.linux-mips.org/
 T:     git git://git.linux-mips.org/pub/scm/ralf/linux.git
@@ -9189,7 +9283,6 @@ F:        drivers/media/dvb-frontends/mn88473*
 
 MODULE SUPPORT
 M:     Jessica Yu <jeyu@kernel.org>
-M:     Rusty Russell <rusty@rustcorp.com.au>
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/jeyu/linux.git modules-next
 S:     Maintained
 F:     include/linux/module.h
@@ -9366,7 +9459,7 @@ L:        linux-mtd@lists.infradead.org
 W:     http://www.linux-mtd.infradead.org/
 Q:     http://patchwork.ozlabs.org/project/linux-mtd/list/
 T:     git git://git.infradead.org/linux-mtd.git nand/fixes
-T:     git git://git.infradead.org/l2-mtd.git nand/next
+T:     git git://git.infradead.org/linux-mtd.git nand/next
 S:     Maintained
 F:     drivers/mtd/nand/
 F:     include/linux/mtd/*nand*.h
@@ -9384,8 +9477,8 @@ F:        drivers/net/ethernet/natsemi/natsemi.c
 
 NCP FILESYSTEM
 M:     Petr Vandrovec <petr@vandrovec.name>
-S:     Odd Fixes
-F:     fs/ncpfs/
+S:     Obsolete
+F:     drivers/staging/ncpfs/
 
 NCR 5380 SCSI DRIVERS
 M:     Finn Thain <fthain@telegraphics.com.au>
@@ -9621,6 +9714,11 @@ NETWORKING [WIRELESS]
 L:     linux-wireless@vger.kernel.org
 Q:     http://patchwork.kernel.org/project/linux-wireless/list/
 
+NETDEVSIM
+M:     Jakub Kicinski <jakub.kicinski@netronome.com>
+S:     Maintained
+F:     drivers/net/netdevsim/*
+
 NETXEN (1/10) GbE SUPPORT
 M:     Manish Chopra <manish.chopra@cavium.com>
 M:     Rahul Verma <rahul.verma@cavium.com>
@@ -9662,8 +9760,8 @@ F:        include/uapi/linux/sunrpc/
 NILFS2 FILESYSTEM
 M:     Ryusuke Konishi <konishi.ryusuke@lab.ntt.co.jp>
 L:     linux-nilfs@vger.kernel.org
-W:     http://nilfs.sourceforge.net/
-W:     http://nilfs.osdn.jp/
+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
@@ -9733,7 +9831,7 @@ F:        drivers/ntb/hw/amd/
 NTB DRIVER CORE
 M:     Jon Mason <jdmason@kudzu.us>
 M:     Dave Jiang <dave.jiang@intel.com>
-M:     Allen Hubbe <Allen.Hubbe@emc.com>
+M:     Allen Hubbe <allenbh@gmail.com>
 L:     linux-ntb@googlegroups.com
 S:     Supported
 W:     https://github.com/jonmason/ntb/wiki
@@ -9767,6 +9865,15 @@ S:       Supported
 F:     Documentation/filesystems/ntfs.txt
 F:     fs/ntfs/
 
+NUBUS SUBSYSTEM
+M:     Finn Thain <fthain@telegraphics.com.au>
+L:     linux-m68k@lists.linux-m68k.org
+S:     Maintained
+F:     arch/*/include/asm/nubus.h
+F:     drivers/nubus/
+F:     include/linux/nubus.h
+F:     include/uapi/linux/nubus.h
+
 NVIDIA (rivafb and nvidiafb) FRAMEBUFFER DRIVER
 M:     Antonino Daplas <adaplas@gmail.com>
 L:     linux-fbdev@vger.kernel.org
@@ -9827,6 +9934,7 @@ NXP TFA9879 DRIVER
 M:     Peter Rosin <peda@axentia.se>
 L:     alsa-devel@alsa-project.org (moderated for non-subscribers)
 S:     Maintained
+F:     Documentation/devicetree/bindings/sound/tfa9879.txt
 F:     sound/soc/codecs/tfa9879*
 
 NXP-NCI NFC DRIVER
@@ -9841,6 +9949,18 @@ M:       Josh Poimboeuf <jpoimboe@redhat.com>
 S:     Supported
 F:     tools/objtool/
 
+OCXL (Open Coherent Accelerator Processor Interface OpenCAPI) DRIVER
+M:     Frederic Barrat <fbarrat@linux.vnet.ibm.com>
+M:     Andrew Donnellan <andrew.donnellan@au1.ibm.com>
+L:     linuxppc-dev@lists.ozlabs.org
+S:     Supported
+F:     arch/powerpc/platforms/powernv/ocxl.c
+F:     arch/powerpc/include/asm/pnv-ocxl.h
+F:     drivers/misc/ocxl/
+F:     include/misc/ocxl*
+F:     include/uapi/misc/ocxl.h
+F:     Documentation/accelerators/ocxl.txt
+
 OMAP AUDIO SUPPORT
 M:     Peter Ujfalusi <peter.ujfalusi@ti.com>
 M:     Jarkko Nikula <jarkko.nikula@bitmer.com>
@@ -10075,6 +10195,14 @@ S:     Maintained
 F:     drivers/media/i2c/ov7670.c
 F:     Documentation/devicetree/bindings/media/i2c/ov7670.txt
 
+OMNIVISION OV7740 SENSOR DRIVER
+M:     Wenyou Yang <wenyou.yang@microchip.com>
+L:     linux-media@vger.kernel.org
+T:     git git://linuxtv.org/media_tree.git
+S:     Maintained
+F:     drivers/media/i2c/ov7740.c
+F:     Documentation/devicetree/bindings/media/i2c/ov7740.txt
+
 ONENAND FLASH DRIVER
 M:     Kyungmin Park <kyungmin.park@samsung.com>
 L:     linux-mtd@lists.infradead.org
@@ -10158,7 +10286,7 @@ F:      drivers/irqchip/irq-ompic.c
 F:     drivers/irqchip/irq-or1k-*
 
 OPENVSWITCH
-M:     Pravin Shelar <pshelar@nicira.com>
+M:     Pravin B Shelar <pshelar@ovn.org>
 L:     netdev@vger.kernel.org
 L:     dev@openvswitch.org
 W:     http://openvswitch.org
@@ -10169,7 +10297,7 @@ F:      include/uapi/linux/openvswitch.h
 OPERATING PERFORMANCE POINTS (OPP)
 M:     Viresh Kumar <vireshk@kernel.org>
 M:     Nishanth Menon <nm@ti.com>
-M:     Stephen Boyd <sboyd@codeaurora.org>
+M:     Stephen Boyd <sboyd@kernel.org>
 L:     linux-pm@vger.kernel.org
 S:     Maintained
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm.git
@@ -10206,7 +10334,8 @@ F:      fs/ocfs2/
 
 ORANGEFS FILESYSTEM
 M:     Mike Marshall <hubcap@omnibond.com>
-L:     pvfs2-developers@beowulf-underground.org (subscribers-only)
+R:     Martin Brandenburg <martin@omnibond.com>
+L:     devel@lists.orangefs.org
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/hubcap/linux.git
 S:     Supported
 F:     fs/orangefs/
@@ -10304,7 +10433,6 @@ F:      Documentation/parport*.txt
 PARAVIRT_OPS INTERFACE
 M:     Juergen Gross <jgross@suse.com>
 M:     Alok Kataria <akataria@vmware.com>
-M:     Rusty Russell <rusty@rustcorp.com.au>
 L:     virtualization@lists.linux-foundation.org
 S:     Supported
 F:     Documentation/virtual/paravirt_ops.txt
@@ -10423,6 +10551,13 @@ S:     Maintained
 F:     Documentation/devicetree/bindings/pci/pci-armada8k.txt
 F:     drivers/pci/dwc/pcie-armada8k.c
 
+PCI DRIVER FOR CADENCE PCIE IP
+M:     Alan Douglas <adouglas@cadence.com>
+L:     linux-pci@vger.kernel.org
+S:     Maintained
+F:     Documentation/devicetree/bindings/pci/cdns,*.txt
+F:     drivers/pci/cadence/pcie-cadence*
+
 PCI DRIVER FOR FREESCALE LAYERSCAPE
 M:     Minghuan Lian <minghuan.Lian@freescale.com>
 M:     Mingkai Hu <mingkai.hu@freescale.com>
@@ -10573,8 +10708,12 @@ T:     git git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci.git
 S:     Supported
 F:     Documentation/devicetree/bindings/pci/
 F:     Documentation/PCI/
+F:     drivers/acpi/pci*
 F:     drivers/pci/
+F:     include/asm-generic/pci*
 F:     include/linux/pci*
+F:     include/uapi/linux/pci*
+F:     lib/pci*
 F:     arch/x86/pci/
 F:     arch/x86/kernel/quirks.c
 
@@ -10664,11 +10803,9 @@ S:     Maintained
 F:     drivers/pci/dwc/*spear*
 
 PCMCIA SUBSYSTEM
-P:     Linux PCMCIA Team
-L:     linux-pcmcia@lists.infradead.org
-W:     http://lists.infradead.org/mailman/listinfo/linux-pcmcia
+M:     Dominik Brodowski <linux@dominikbrodowski.net>
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia.git
-S:     Maintained
+S:     Odd Fixes
 F:     Documentation/pcmcia/
 F:     tools/pcmcia/
 F:     drivers/pcmcia/
@@ -10795,6 +10932,16 @@ M:     Heikki Krogerus <heikki.krogerus@linux.intel.com>
 S:     Maintained
 F:     drivers/pinctrl/intel/
 
+PIN CONTROLLER - MEDIATEK
+M:     Sean Wang <sean.wang@mediatek.com>
+L:     linux-mediatek@lists.infradead.org (moderated for non-subscribers)
+S:     Maintained
+F:     Documentation/devicetree/bindings/pinctrl/pinctrl-mt65xx.txt
+F:     Documentation/devicetree/bindings/pinctrl/pinctrl-mt7622.txt
+F:     drivers/pinctrl/mediatek/pinctrl-mtk-common.*
+F:     drivers/pinctrl/mediatek/pinctrl-mt2701.c
+F:     drivers/pinctrl/mediatek/pinctrl-mt7622.c
+
 PIN CONTROLLER - QUALCOMM
 M:     Bjorn Andersson <bjorn.andersson@linaro.org>
 S:     Maintained
@@ -10913,6 +11060,7 @@ F:      include/linux/pm.h
 F:     include/linux/pm_*
 F:     include/linux/powercap.h
 F:     drivers/powercap/
+F:     kernel/configs/nopm.config
 
 POWER STATE COORDINATION INTERFACE (PSCI)
 M:     Mark Rutland <mark.rutland@arm.com>
@@ -11207,7 +11355,8 @@ S:      Maintained
 F:     drivers/firmware/qemu_fw_cfg.c
 
 QIB DRIVER
-M:     Mike Marciniszyn <infinipath@intel.com>
+M:     Dennis Dalessandro <dennis.dalessandro@intel.com>
+M:     Mike Marciniszyn <mike.marciniszyn@intel.com>
 L:     linux-rdma@vger.kernel.org
 S:     Supported
 F:     drivers/infiniband/hw/qib/
@@ -11234,7 +11383,6 @@ F:      include/linux/qed/
 F:     drivers/net/ethernet/qlogic/qede/
 
 QLOGIC QL4xxx RDMA DRIVER
-M:     Ram Amrani <Ram.Amrani@cavium.com>
 M:     Michal Kalderon <Michal.Kalderon@cavium.com>
 M:     Ariel Elior <Ariel.Elior@cavium.com>
 L:     linux-rdma@vger.kernel.org
@@ -11381,6 +11529,7 @@ 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
 T:     git git://people.freedesktop.org/~agd5f/linux
 S:     Supported
@@ -11480,15 +11629,6 @@ L:     linux-wireless@vger.kernel.org
 S:     Orphan
 F:     drivers/net/wireless/ray*
 
-RCUTORTURE MODULE
-M:     Josh Triplett <josh@joshtriplett.org>
-M:     "Paul E. McKenney" <paulmck@linux.vnet.ibm.com>
-L:     linux-kernel@vger.kernel.org
-S:     Supported
-T:     git git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git
-F:     Documentation/RCU/torture.txt
-F:     kernel/rcu/rcutorture.c
-
 RCUTORTURE TEST FRAMEWORK
 M:     "Paul E. McKenney" <paulmck@linux.vnet.ibm.com>
 M:     Josh Triplett <josh@joshtriplett.org>
@@ -11512,6 +11652,7 @@ F:      drivers/net/ethernet/rdc/r6040.c
 
 RDMAVT - RDMA verbs software
 M:     Dennis Dalessandro <dennis.dalessandro@intel.com>
+M:     Mike Marciniszyn <mike.marciniszyn@intel.com>
 L:     linux-rdma@vger.kernel.org
 S:     Supported
 F:     drivers/infiniband/sw/rdmavt
@@ -11681,8 +11822,8 @@ F:      drivers/mtd/nand/r852.h
 RISC-V ARCHITECTURE
 M:     Palmer Dabbelt <palmer@sifive.com>
 M:     Albert Ou <albert@sifive.com>
-L:     patches@groups.riscv.org
-T:     git https://github.com/riscv/riscv-linux
+L:     linux-riscv@lists.infradead.org
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/palmer/riscv-linux.git
 S:     Supported
 F:     arch/riscv/
 K:     riscv
@@ -11789,15 +11930,13 @@ T:    git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-testing.g
 S:     Maintained
 F:     drivers/net/wireless/realtek/rtl818x/rtl8187/
 
-RTL8192CE WIRELESS DRIVER
-M:     Larry Finger <Larry.Finger@lwfinger.net>
-M:     Chaoming Li <chaoming_li@realsil.com.cn>
+REALTEK WIRELESS DRIVER (rtlwifi family)
+M:     Ping-Ke Shih <pkshih@realtek.com>
 L:     linux-wireless@vger.kernel.org
 W:     http://wireless.kernel.org/
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-testing.git
 S:     Maintained
 F:     drivers/net/wireless/realtek/rtlwifi/
-F:     drivers/net/wireless/realtek/rtlwifi/rtl8192ce/
 
 RTL8XXXU WIRELESS DRIVER (rtl8xxxu)
 M:     Jes Sorensen <Jes.Sorensen@gmail.com>
@@ -11890,6 +12029,7 @@ F:      drivers/pci/hotplug/s390_pci_hpc.c
 S390 VFIO-CCW DRIVER
 M:     Cornelia Huck <cohuck@redhat.com>
 M:     Dong Jia Shi <bjsdjshi@linux.vnet.ibm.com>
+M:     Halil Pasic <pasic@linux.vnet.ibm.com>
 L:     linux-s390@vger.kernel.org
 L:     kvm@vger.kernel.org
 S:     Supported
@@ -11961,6 +12101,13 @@ S:     Maintained
 F:     drivers/crypto/exynos-rng.c
 F:     Documentation/devicetree/bindings/crypto/samsung,exynos-rng4.txt
 
+SAMSUNG EXYNOS TRUE RANDOM NUMBER GENERATOR (TRNG) DRIVER
+M:     Łukasz Stelmach <l.stelmach@samsung.com>
+L:     linux-samsung-soc@vger.kernel.org
+S:     Maintained
+F:     drivers/char/hw_random/exynos-trng.c
+F:     Documentation/devicetree/bindings/rng/samsung,exynos5250-trng.txt
+
 SAMSUNG FRAMEBUFFER DRIVER
 M:     Jingoo Han <jingoohan1@gmail.com>
 L:     linux-fbdev@vger.kernel.org
@@ -12023,6 +12170,7 @@ F:      drivers/media/i2c/s5k5baf.c
 SAMSUNG S5P Security SubSystem (SSS) DRIVER
 M:     Krzysztof Kozlowski <krzk@kernel.org>
 M:     Vladimir Zapolskiy <vz@mleia.com>
+M:     Kamil Konieczny <k.konieczny@partner.samsung.com>
 L:     linux-crypto@vger.kernel.org
 L:     linux-samsung-soc@vger.kernel.org
 S:     Maintained
@@ -12263,7 +12411,7 @@ M:      Security Officers <security@kernel.org>
 S:     Supported
 
 SECURITY SUBSYSTEM
-M:     James Morris <james.l.morris@oracle.com>
+M:     James Morris <jmorris@namei.org>
 M:     "Serge E. Hallyn" <serge@hallyn.com>
 L:     linux-security-module@vger.kernel.org (suggested Cc:)
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security.git
@@ -12367,6 +12515,14 @@ T:     git git://linuxtv.org/anttip/media_tree.git
 S:     Maintained
 F:     drivers/media/tuners/si2157*
 
+SI2165 MEDIA DRIVER
+M:     Matthias Schwarzott <zzam@gentoo.org>
+L:     linux-media@vger.kernel.org
+W:     https://linuxtv.org
+Q:     http://patchwork.linuxtv.org/project/linux-media/list/
+S:     Maintained
+F:     drivers/media/dvb-frontends/si2165*
+
 SI2168 MEDIA DRIVER
 M:     Antti Palosaari <crope@iki.fi>
 L:     linux-media@vger.kernel.org
@@ -12490,6 +12646,13 @@ F:     lib/siphash.c
 F:     lib/test_siphash.c
 F:     include/linux/siphash.h
 
+SIOX
+M:     Gavin Schenk <g.schenk@eckelmann.de>
+M:     Uwe Kleine-König <kernel@pengutronix.de>
+S:     Supported
+F:     drivers/siox/*
+F:     include/trace/events/siox.h
+
 SIS 190 ETHERNET DRIVER
 M:     Francois Romieu <romieu@fr.zoreil.com>
 L:     netdev@vger.kernel.org
@@ -12541,6 +12704,14 @@ 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
 
+SERIAL LOW-POWER INTER-CHIP MEDIA BUS (SLIMbus)
+M:     Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
+L:     alsa-devel@alsa-project.org (moderated for non-subscribers)
+S:     Maintained
+F:     drivers/slimbus/
+F:     Documentation/devicetree/bindings/slimbus/
+F:     include/linux/slimbus.h
+
 SMACK SECURITY MODULE
 M:     Casey Schaufler <casey@schaufler-ca.com>
 L:     linux-security-module@vger.kernel.org
@@ -12622,6 +12793,12 @@ F:     include/media/soc*
 F:     drivers/media/i2c/soc_camera/
 F:     drivers/media/platform/soc_camera/
 
+SOCIONEXT UNIPHIER SOUND DRIVER
+M:     Katsuhiro Suzuki <suzuki.katsuhiro@socionext.com>
+L:     alsa-devel@alsa-project.org (moderated for non-subscribers)
+S:     Maintained
+F:     sound/soc/uniphier/
+
 SOEKRIS NET48XX LED SUPPORT
 M:     Chris Boot <bootc@bootc.net>
 S:     Maintained
@@ -12646,6 +12823,15 @@ L:     linux-media@vger.kernel.org
 S:     Supported
 F:     drivers/media/pci/solo6x10/
 
+SOFTWARE DELEGATED EXCEPTION INTERFACE (SDEI)
+M:     James Morse <james.morse@arm.com>
+L:     linux-arm-kernel@lists.infradead.org
+S:     Maintained
+F:     Documentation/devicetree/bindings/arm/firmware/sdei.txt
+F:     drivers/firmware/arm_sdei.c
+F:     include/linux/sdei.h
+F:     include/uapi/linux/sdei.h
+
 SOFTWARE RAID (Multiple Disks) SUPPORT
 M:     Shaohua Li <shli@kernel.org>
 L:     linux-raid@vger.kernel.org
@@ -12658,6 +12844,13 @@ F:     drivers/md/raid*
 F:     include/linux/raid/
 F:     include/uapi/linux/raid/
 
+SOCIONEXT (SNI) NETSEC NETWORK DRIVER
+M:     Jassi Brar <jaswinder.singh@linaro.org>
+L:     netdev@vger.kernel.org
+S:     Maintained
+F:     drivers/net/ethernet/socionext/netsec.c
+F:     Documentation/devicetree/bindings/net/socionext-netsec.txt
+
 SONIC NETWORK DRIVER
 M:     Thomas Bogendoerfer <tsbogend@alpha.franken.de>
 L:     netdev@vger.kernel.org
@@ -12744,6 +12937,16 @@ F:     Documentation/sound/alsa/soc/
 F:     sound/soc/
 F:     include/sound/soc*
 
+SOUNDWIRE SUBSYSTEM
+M:     Vinod Koul <vinod.koul@intel.com>
+M:     Sanyog Kale <sanyog.r.kale@intel.com>
+R:     Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
+L:     alsa-devel@alsa-project.org (moderated for non-subscribers)
+S:     Supported
+F:     Documentation/driver-api/soundwire/
+F:     drivers/soundwire/
+F:     include/linux/soundwire/
+
 SP2 MEDIA DRIVER
 M:     Olli Salonen <olli.salonen@iki.fi>
 L:     linux-media@vger.kernel.org
@@ -12810,7 +13013,7 @@ L:      linux-mtd@lists.infradead.org
 W:     http://www.linux-mtd.infradead.org/
 Q:     http://patchwork.ozlabs.org/project/linux-mtd/list/
 T:     git git://git.infradead.org/linux-mtd.git spi-nor/fixes
-T:     git git://git.infradead.org/l2-mtd.git spi-nor/next
+T:     git git://git.infradead.org/linux-mtd.git spi-nor/next
 S:     Maintained
 F:     drivers/mtd/spi-nor/
 F:     include/linux/mtd/spi-nor.h
@@ -12836,7 +13039,7 @@ F:      Documentation/networking/spider_net.txt
 F:     drivers/net/ethernet/toshiba/spider_net*
 
 SPMI SUBSYSTEM
-R:     Stephen Boyd <sboyd@codeaurora.org>
+R:     Stephen Boyd <sboyd@kernel.org>
 L:     linux-arm-msm@vger.kernel.org
 F:     Documentation/devicetree/bindings/spmi/
 F:     drivers/spmi/
@@ -12897,12 +13100,6 @@ S:     Odd Fixes
 F:     Documentation/devicetree/bindings/staging/iio/
 F:     drivers/staging/iio/
 
-STAGING - LIRC (LINUX INFRARED REMOTE CONTROL) DRIVERS
-M:     Jarod Wilson <jarod@wilsonet.com>
-W:     http://www.lirc.org/
-S:     Odd Fixes
-F:     drivers/staging/media/lirc/
-
 STAGING - LUSTRE PARALLEL FILESYSTEM
 M:     Oleg Drokin <oleg.drokin@intel.com>
 M:     Andreas Dilger <andreas.dilger@intel.com>
@@ -13063,7 +13260,7 @@ F:      arch/x86/boot/video*
 
 SWIOTLB SUBSYSTEM
 M:     Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
-L:     linux-kernel@vger.kernel.org
+L:     iommu@lists.linux-foundation.org
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/konrad/swiotlb.git
 S:     Supported
 F:     lib/swiotlb.c
@@ -13128,6 +13325,11 @@ S:     Supported
 F:     drivers/reset/reset-axs10x.c
 F:     Documentation/devicetree/bindings/reset/snps,axs10x-reset.txt
 
+SYNOPSYS DESIGNWARE 8250 UART DRIVER
+R:     Andy Shevchenko <andriy.shevchenko@linux.intel.com>
+S:     Maintained
+F:     drivers/tty/serial/8250/8250_dw.c
+
 SYNOPSYS DESIGNWARE APB GPIO DRIVER
 M:     Hoan Tran <hotran@apm.com>
 L:     linux-gpio@vger.kernel.org
@@ -13144,7 +13346,7 @@ F:      include/linux/platform_data/dma-dw.h
 F:     drivers/dma/dw/
 
 SYNOPSYS DESIGNWARE ENTERPRISE ETHERNET DRIVER
-M:     Jie Deng <jiedeng@synopsys.com>
+M:     Jose Abreu <Jose.Abreu@synopsys.com>
 L:     netdev@vger.kernel.org
 S:     Supported
 F:     drivers/net/ethernet/synopsys/
@@ -13283,6 +13485,15 @@ T:     git git://linuxtv.org/anttip/media_tree.git
 S:     Maintained
 F:     drivers/media/tuners/tda18218*
 
+TDA18250 MEDIA DRIVER
+M:     Olli Salonen <olli.salonen@iki.fi>
+L:     linux-media@vger.kernel.org
+W:     https://linuxtv.org
+Q:     http://patchwork.linuxtv.org/project/linux-media/list/
+T:     git git://linuxtv.org/media_tree.git
+S:     Maintained
+F:     drivers/media/tuners/tda18250*
+
 TDA18271 MEDIA DRIVER
 M:     Michael Krufky <mkrufky@linuxtv.org>
 L:     linux-media@vger.kernel.org
@@ -13520,6 +13731,7 @@ M:      Mika Westerberg <mika.westerberg@linux.intel.com>
 M:     Yehezkel Bernat <yehezkel.bernat@intel.com>
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt.git
 S:     Maintained
+F:     Documentation/admin-guide/thunderbolt.rst
 F:     drivers/thunderbolt/
 F:     include/linux/thunderbolt.h
 
@@ -13712,7 +13924,7 @@ F:      include/linux/usb/tilegx.h
 TIMEKEEPING, CLOCKSOURCE CORE, NTP, ALARMTIMER
 M:     John Stultz <john.stultz@linaro.org>
 M:     Thomas Gleixner <tglx@linutronix.de>
-R:     Stephen Boyd <sboyd@codeaurora.org>
+R:     Stephen Boyd <sboyd@kernel.org>
 L:     linux-kernel@vger.kernel.org
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git timers/core
 S:     Supported
@@ -13795,6 +14007,18 @@ L:     platform-driver-x86@vger.kernel.org
 S:     Maintained
 F:     drivers/platform/x86/topstar-laptop.c
 
+TORTURE-TEST MODULES
+M:     Davidlohr Bueso <dave@stgolabs.net>
+M:     "Paul E. McKenney" <paulmck@linux.vnet.ibm.com>
+M:     Josh Triplett <josh@joshtriplett.org>
+L:     linux-kernel@vger.kernel.org
+S:     Supported
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git
+F:     Documentation/RCU/torture.txt
+F:     kernel/torture.c
+F:     kernel/rcu/rcutorture.c
+F:     kernel/locking/locktorture.c
+
 TOSHIBA ACPI EXTRAS DRIVER
 M:     Azael Avalos <coproscefalo@gmail.com>
 L:     platform-driver-x86@vger.kernel.org
@@ -13837,9 +14061,10 @@ F:     drivers/platform/x86/toshiba-wmi.c
 TPM DEVICE DRIVER
 M:     Peter Huewe <peterhuewe@gmx.de>
 M:     Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
-R:     Jason Gunthorpe <jgunthorpe@obsidianresearch.com>
+R:     Jason Gunthorpe <jgg@ziepe.ca>
 L:     linux-integrity@vger.kernel.org
 Q:     https://patchwork.kernel.org/project/linux-integrity/list/
+W:     https://kernsec.org/wiki/index.php/Linux_Kernel_Integrity
 T:     git git://git.infradead.org/users/jjs/linux-tpmdd.git
 S:     Maintained
 F:     drivers/char/tpm/
@@ -13878,6 +14103,13 @@ T:     git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial.git
 S:     Maintained
 K:     ^Subject:.*(?i)trivial
 
+TEMPO SEMICONDUCTOR DRIVERS
+M:     Steven Eckhoff <steven.eckhoff.opensource@gmail.com>
+S:     Maintained
+F:     sound/soc/codecs/tscs*.c
+F:     sound/soc/codecs/tscs*.h
+F:     Documentation/devicetree/bindings/sound/tscs*.txt
+
 TTY LAYER
 M:     Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 M:     Jiri Slaby <jslaby@suse.com>
@@ -14039,6 +14271,8 @@ UNISYS S-PAR DRIVERS
 M:     David Kershner <david.kershner@unisys.com>
 L:     sparmaintainer@unisys.com (Unisys internal)
 S:     Supported
+F:     include/linux/visorbus.h
+F:     drivers/visorbus/
 F:     drivers/staging/unisys/
 
 UNIVERSAL FLASH STORAGE HOST CONTROLLER DRIVER
@@ -14585,6 +14819,15 @@ S:     Maintained
 F:     drivers/virtio/virtio_input.c
 F:     include/uapi/linux/virtio_input.h
 
+VIRTUAL BOX GUEST DEVICE DRIVER
+M:     Hans de Goede <hdegoede@redhat.com>
+M:     Arnd Bergmann <arnd@arndb.de>
+M:     Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+S:     Maintained
+F:     include/linux/vbox_utils.h
+F:     include/uapi/linux/vbox*.h
+F:     drivers/virt/vboxguest/
+
 VIRTUAL SERIO DEVICE DRIVER
 M:     Stephen Chandler Paul <thatslyude@gmail.com>
 S:     Maintained
@@ -14676,6 +14919,7 @@ W:      http://www.slimlogic.co.uk/?p=48
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git
 S:     Supported
 F:     Documentation/devicetree/bindings/regulator/
+F:     Documentation/power/regulator/
 F:     drivers/regulator/
 F:     include/dt-bindings/regulator/
 F:     include/linux/regulator/
@@ -14748,8 +14992,8 @@ S:      Maintained
 F:     drivers/input/tablet/wacom_serial4.c
 
 WATCHDOG DEVICE DRIVERS
-M:     Wim Van Sebroeck <wim@iguana.be>
-R:     Guenter Roeck <linux@roeck-us.net>
+M:     Wim Van Sebroeck <wim@linux-watchdog.org>
+M:     Guenter Roeck <linux@roeck-us.net>
 L:     linux-watchdog@vger.kernel.org
 W:     http://www.linux-watchdog.org/
 T:     git git://www.linux-watchdog.org/linux-watchdog.git
@@ -14773,9 +15017,9 @@ S:      Maintained
 F:     drivers/hid/hid-wiimote*
 
 WILOCITY WIL6210 WIRELESS DRIVER
-M:     Maya Erez <qca_merez@qca.qualcomm.com>
+M:     Maya Erez <merez@codeaurora.org>
 L:     linux-wireless@vger.kernel.org
-L:     wil6210@qca.qualcomm.com
+L:     wil6210@qti.qualcomm.com
 S:     Supported
 W:     http://wireless.kernel.org/en/users/Drivers/wil6210
 F:     drivers/net/wireless/ath/wil6210/
@@ -14869,6 +15113,12 @@ F:     include/linux/workqueue.h
 F:     kernel/workqueue.c
 F:     Documentation/core-api/workqueue.rst
 
+X-POWERS AXP288 PMIC DRIVERS
+M:     Hans de Goede <hdegoede@redhat.com>
+S:     Maintained
+N:     axp288
+F:     drivers/acpi/pmic/intel_pmic_xpower.c
+
 X-POWERS MULTIFUNCTION PMIC DEVICE DRIVERS
 M:     Chen-Yu Tsai <wens@csie.org>
 L:     linux-kernel@vger.kernel.org
@@ -14886,7 +15136,7 @@ F:      net/x25/
 X86 ARCHITECTURE (32-BIT AND 64-BIT)
 M:     Thomas Gleixner <tglx@linutronix.de>
 M:     Ingo Molnar <mingo@redhat.com>
-M:     "H. Peter Anvin" <hpa@zytor.com>
+R:     "H. Peter Anvin" <hpa@zytor.com>
 M:     x86@kernel.org
 L:     linux-kernel@vger.kernel.org
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git x86/core
@@ -14910,7 +15160,7 @@ 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/users/dvhart/linux-platform-drivers-x86.git
+T:     git git://git.infradead.org/linux-platform-drivers-x86.git
 S:     Maintained
 F:     drivers/platform/x86/
 F:     drivers/platform/olpc/
@@ -14996,6 +15246,7 @@ F:      include/xen/interface/io/vscsiif.h
 XEN SWIOTLB SUBSYSTEM
 M:     Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
 L:     xen-devel@lists.xenproject.org (moderated for non-subscribers)
+L:     iommu@lists.linux-foundation.org
 S:     Supported
 F:     arch/x86/xen/*swiotlb*
 F:     drivers/xen/*swiotlb*