Merge tag 'iomap-4.21-merge-3' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux

Pull iomap maintainer update from Darrick Wong:
 "Christoph Hellwig and I have decided to take responsibility for the fs
  iomap code rather than let it languish further"

* tag 'iomap-4.21-merge-3' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux:
  iomap: take responsibility for the filesystem iomap code

diff --combined MAINTAINERS
index 5a0d1d4a905d8912b7337b9a3fb06fcdae4883f9,d2c034aed4beec32c8219575764ab91d4eb283a8..bc00793a03c828545c974ce19fe944b44aee87a5
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -140,7 -140,7 +140,7 @@@ Maintainers List (try to look for most 
  M:    Steffen Klassert <[email protected]>
  L:    [email protected]
  S:    Odd Fixes
 -F:    Documentation/networking/vortex.txt
 +F:    Documentation/networking/device_drivers/3com/vortex.txt
  F:    drivers/net/ethernet/3com/3c59x.c
  
  3CR990 NETWORK DRIVER
@@@ -740,7 -740,7 +740,7 @@@ R: Saeed Bishara <[email protected]
  R:    Zorik Machulsky <[email protected]>
  L:    [email protected]
  S:    Supported
 -F:    Documentation/networking/ena.txt
 +F:    Documentation/networking/device_drivers/amazon/ena.txt
  F:    drivers/net/ethernet/amazon/
  
  AMD CRYPTOGRAPHIC COPROCESSOR (CCP) DRIVER
@@@ -846,14 -846,6 +846,14 @@@ S:       Supporte
  F:    drivers/iio/dac/ad5758.c
  F:    Documentation/devicetree/bindings/iio/dac/ad5758.txt
  
 +ANALOG DEVICES INC AD7124 DRIVER
 +M:    Stefan Popa <[email protected]>
 +L:    [email protected]
 +W:    http://ez.analog.com/community/linux-device-drivers
 +S:    Supported
 +F:    drivers/iio/adc/ad7124.c
 +F:    Documentation/devicetree/bindings/iio/adc/adi,ad7124.txt
 +
  ANALOG DEVICES INC AD9389B DRIVER
  M:    Hans Verkuil <[email protected]>
  L:    [email protected]
@@@ -958,7 -950,6 +958,7 @@@ M: Arve Hjønnevåg <[email protected]
  M:    Todd Kjos <[email protected]>
  M:    Martijn Coenen <[email protected]>
  M:    Joel Fernandes <[email protected]>
 +M:    Christian Brauner <[email protected]>
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git
  L:    [email protected]
  S:    Supported
@@@ -1306,6 -1297,7 +1306,6 @@@ F:      include/dt-bindings/clock/gxbb
  F:    Documentation/devicetree/bindings/clock/amlogic*
  
  ARM/Amlogic Meson SoC support
 -M:    Carlo Caione <[email protected]>
  M:    Kevin Hilman <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  L:    [email protected]
@@@ -1316,16 -1308,8 +1316,16 @@@ F:    arch/arm/boot/dts/meson
  F:    arch/arm64/boot/dts/amlogic/
  F:    drivers/pinctrl/meson/
  F:    drivers/mmc/host/meson*
 +F:    drivers/soc/amlogic/
  N:    meson
  
 +ARM/Amlogic Meson SoC Sound Drivers
 +M:    Jerome Brunet <[email protected]>
 +L:    [email protected] (moderated for non-subscribers)
 +S:    Maintained
 +F:    sound/soc/meson/
 +F:    Documentation/devicetree/bindings/sound/amlogic*
 +
  ARM/Annapurna Labs ALPINE ARCHITECTURE
  M:    Tsahee Zidenberg <[email protected]>
  M:    Antoine Tenart <[email protected]>
@@@ -1443,7 -1427,6 +1443,7 @@@ F:      arch/arm/mach-ep93xx/micro9.
  
  ARM/CORESIGHT FRAMEWORK AND DRIVERS
  M:    Mathieu Poirier <[email protected]>
 +R:    Suzuki K Poulose <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
  F:    drivers/hwtracing/coresight/*
@@@ -1540,7 -1523,6 +1540,7 @@@ F:      arch/arm/mach-imx
  F:    arch/arm/mach-mxs/
  F:    arch/arm/boot/dts/imx*
  F:    arch/arm/configs/imx*_defconfig
 +F:    arch/arm64/boot/dts/freescale/imx*
  F:    drivers/clk/imx/
  F:    drivers/firmware/imx/
  F:    drivers/soc/imx/
@@@ -1968,20 -1950,6 +1968,20 @@@ M:    Lennert Buytenhek <kernel@wantstofly
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
  
 +ARM/RDA MICRO ARCHITECTURE
 +M:    Manivannan Sadhasivam <[email protected]>
 +L:    [email protected] (moderated for non-subscribers)
 +L:    [email protected] (moderated for non-subscribers)
 +S:    Maintained
 +F:    arch/arm/boot/dts/rda8810pl-*
 +F:    drivers/clocksource/timer-rda.c
 +F:    drivers/irqchip/irq-rda-intc.c
 +F:    drivers/tty/serial/rda-uart.c
 +F:    Documentation/devicetree/bindings/arm/rda.txt
 +F:    Documentation/devicetree/bindings/interrupt-controller/rda,8810pl-intc.txt
 +F:    Documentation/devicetree/bindings/serial/rda,8810pl-uart.txt
 +F:    Documentation/devicetree/bindings/timer/rda,8810pl-timer.txt
 +
  ARM/REALTEK ARCHITECTURE
  M:    Andreas Färber <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
@@@ -2099,6 -2067,7 +2099,6 @@@ M:      Andrzej Hajda <[email protected]
  L:    [email protected]
  L:    [email protected]
  S:    Maintained
 -F:    arch/arm/plat-samsung/s5p-dev-mfc.c
  F:    drivers/media/platform/s5p-mfc/
  
  ARM/SHMOBILE ARM ARCHITECTURE
@@@ -2240,7 -2209,6 +2240,7 @@@ S:      Supporte
  F:    Documentation/devicetree/bindings/arm/ti/k3.txt
  F:    arch/arm64/boot/dts/ti/Makefile
  F:    arch/arm64/boot/dts/ti/k3-*
 +F:    include/dt-bindings/pinctrl/k3.h
  
  ARM/TEXAS INSTRUMENT KEYSTONE ARCHITECTURE
  M:    Santosh Shilimkar <[email protected]>
@@@ -2284,7 -2252,6 +2284,7 @@@ M:      Masahiro Yamada <yamada.masahiro@soc
  L:    [email protected] (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/arm/socionext/uniphier.txt
  F:    Documentation/devicetree/bindings/gpio/gpio-uniphier.txt
  F:    Documentation/devicetree/bindings/pinctrl/socionext,uniphier-pinctrl.txt
  F:    arch/arm/boot/dts/uniphier*
@@@ -2294,7 -2261,6 +2294,7 @@@ F:      arch/arm/mm/cache-uniphier.
  F:    arch/arm64/boot/dts/socionext/uniphier*
  F:    drivers/bus/uniphier-system-bus.c
  F:    drivers/clk/uniphier/
 +F:    drivers/dmaengine/uniphier-mdmac.c
  F:    drivers/gpio/gpio-uniphier.c
  F:    drivers/i2c/busses/i2c-uniphier*
  F:    drivers/irqchip/irq-uniphier-aidet.c
@@@ -2381,7 -2347,7 +2381,7 @@@ F:      drivers/pinctrl/zte
  F:    drivers/soc/zte/
  F:    drivers/thermal/zx2967_thermal.c
  F:    drivers/watchdog/zx2967_wdt.c
 -F:    Documentation/devicetree/bindings/arm/zte.txt
 +F:    Documentation/devicetree/bindings/arm/zte.yaml
  F:    Documentation/devicetree/bindings/clock/zx2967*.txt
  F:    Documentation/devicetree/bindings/dma/zxdma.txt
  F:    Documentation/devicetree/bindings/gpio/zx296702-gpio.txt
@@@ -2453,14 -2419,6 +2453,14 @@@ S:    Maintaine
  F:    Documentation/hwmon/asc7621
  F:    drivers/hwmon/asc7621.c
  
 +ASPEED VIDEO ENGINE DRIVER
 +M:    Eddie James <[email protected]>
 +L:    [email protected]
 +L:    [email protected] (moderated for non-subscribers)
 +S:    Maintained
 +F:    drivers/media/platform/aspeed-video.c
 +F:    Documentation/devicetree/bindings/media/aspeed-video.txt
 +
  ASUS NOTEBOOKS AND EEEPC ACPI/WMI EXTRAS DRIVERS
  M:    Corentin Chary <[email protected]>
  L:    [email protected]
@@@ -2675,13 -2633,6 +2675,13 @@@ S:    Maintaine
  F:    Documentation/devicetree/bindings/sound/axentia,*
  F:    sound/soc/atmel/tse850-pcm5142.c
  
 +AXXIA I2C CONTROLLER
 +M:    Krzysztof Adamski <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/i2c/i2c-axxia.txt
 +F:    drivers/i2c/busses/i2c-axxia.c
 +
  AZ6007 DVB DRIVER
  M:    Mauro Carvalho Chehab <[email protected]>
  L:    [email protected]
@@@ -3512,7 -3463,6 +3512,7 @@@ F:      include/linux/spi/cc2520.
  F:    Documentation/devicetree/bindings/net/ieee802154/cc2520.txt
  
  CCREE ARM TRUSTZONE CRYPTOCELL REE DRIVER
 +M:    Yael Chemla <[email protected]>
  M:    Gilad Ben-Yossef <[email protected]>
  L:    [email protected]
  S:    Supported
@@@ -3716,8 -3666,6 +3716,8 @@@ F:      drivers/net/ethernet/cisco/enic
  
  CISCO VIC LOW LATENCY NIC DRIVER
  M:    Christian Benvenuti <[email protected]>
 +M:    Nelson Escobar <[email protected]>
 +M:    Parvi Kaustubhi <[email protected]>
  S:    Supported
  F:    drivers/infiniband/hw/usnic/
  
@@@ -3731,10 -3679,8 +3731,10 @@@ W:    https://github.com/CirrusLogic/linux
  S:    Supported
  F:    Documentation/devicetree/bindings/mfd/madera.txt
  F:    Documentation/devicetree/bindings/pinctrl/cirrus,madera-pinctrl.txt
 +F:    include/linux/irqchip/irq-madera*
  F:    include/linux/mfd/madera/*
  F:    drivers/gpio/gpio-madera*
 +F:    drivers/irqchip/irq-madera*
  F:    drivers/mfd/madera*
  F:    drivers/mfd/cs47l*
  F:    drivers/pinctrl/cirrus/*
@@@ -4042,20 -3988,13 +4042,20 @@@ T:   git git://linuxtv.org/media_tree.gi
  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 <[email protected]>
  S:    Maintained
  F:    sound/pci/cs5535audio/
  
 +CSI DRIVERS FOR ALLWINNER V3s
 +M:    Yong Deng <[email protected]>
 +L:    [email protected]
 +T:    git git://linuxtv.org/media_tree.git
 +S:    Maintained
 +F:    drivers/media/platform/sunxi/sun6i-csi/
 +F:    Documentation/devicetree/bindings/media/sun6i-csi.txt
 +
  CW1200 WLAN driver
  M:    Solomon Peachy <[email protected]>
  S:    Maintained
@@@ -4080,7 -4019,7 +4080,7 @@@ T:      git git://linuxtv.org/media_tree.gi
  W:    https://linuxtv.org
  S:    Maintained
  F:    drivers/media/common/cx2341x*
 -F:    include/media/cx2341x*
 +F:    include/media/drv-intf/cx2341x.h
  
  CX24120 MEDIA DRIVER
  M:    Jemma Denson <[email protected]>
@@@ -4111,7 -4050,7 +4111,7 @@@ S:      Maintaine
  F:    drivers/media/dvb-frontends/cxd2820r*
  
  CXGB3 ETHERNET DRIVER (CXGB3)
 -M:    Santosh Raspatur <santosh@chelsio.com>
 +M:    Arjun Vynipadath <arjun@chelsio.com>
  L:    [email protected]
  W:    http://www.chelsio.com
  S:    Supported
@@@ -4140,7 -4079,7 +4140,7 @@@ S:      Supporte
  F:    drivers/crypto/chelsio
  
  CXGB4 ETHERNET DRIVER (CXGB4)
 -M:    Ganesh Goudar <ganeshgr@chelsio.com>
 +M:    Arjun Vynipadath <arjun@chelsio.com>
  L:    [email protected]
  W:    http://www.chelsio.com
  S:    Supported
@@@ -4169,7 -4108,7 +4169,7 @@@ S:      Supporte
  F:    drivers/net/ethernet/chelsio/cxgb4vf/
  
  CXL (IBM Coherent Accelerator Processor Interface CAPI) DRIVER
 -M:    Frederic Barrat <fbarrat@linux.vnet.ibm.com>
 +M:    Frederic Barrat <[email protected]>
  M:    Andrew Donnellan <[email protected]>
  L:    [email protected]
  S:    Supported
@@@ -4181,9 -4120,9 +4181,9 @@@ F:      Documentation/powerpc/cxl.tx
  F:    Documentation/ABI/testing/sysfs-class-cxl
  
  CXLFLASH (IBM Coherent Accelerator Processor Interface CAPI Flash) SCSI DRIVER
 -M:    Manoj N. Kumar <manoj@linux.vnet.ibm.com>
 -M:    Matthew R. Ochs <mrochs@linux.vnet.ibm.com>
 -M:    Uma Krishnan <ukrishn@linux.vnet.ibm.com>
 +M:    Manoj N. Kumar <[email protected]>
 +M:    Matthew R. Ochs <[email protected]>
 +M:    Uma Krishnan <[email protected]>
  L:    [email protected]
  S:    Supported
  F:    drivers/scsi/cxlflash/
@@@ -4255,7 -4194,7 +4255,7 @@@ F:      net/ax25/sysctl_net_ax25.
  DAVICOM FAST ETHERNET (DMFE) NETWORK DRIVER
  L:    [email protected]
  S:    Orphan
 -F:    Documentation/networking/dmfe.txt
 +F:    Documentation/networking/device_drivers/dec/dmfe.txt
  F:    drivers/net/ethernet/dec/tulip/dmfe.c
  
  DC390/AM53C974 SCSI driver
@@@ -4791,13 -4730,6 +4791,13 @@@ S:    Maintaine
  F:    drivers/gpu/drm/tinydrm/ili9225.c
  F:    Documentation/devicetree/bindings/display/ilitek,ili9225.txt
  
 +DRM DRIVER FOR HX8357D PANELS
 +M:    Eric Anholt <[email protected]>
 +T:    git git://anongit.freedesktop.org/drm/drm-misc
 +S:    Maintained
 +F:    drivers/gpu/drm/tinydrm/hx8357d.c
 +F:    Documentation/devicetree/bindings/display/himax,hx8357d.txt
 +
  DRM DRIVER FOR INTEL I810 VIDEO CARDS
  S:    Orphan / Obsolete
  F:    drivers/gpu/drm/i810/
@@@ -4839,12 -4771,6 +4839,12 @@@ S:    Supporte
  F:    drivers/gpu/drm/nouveau/
  F:    include/uapi/drm/nouveau_drm.h
  
 +DRM DRIVER FOR OLIMEX LCD-OLINUXINO PANELS
 +M:    Stefan Mavrodiev <[email protected]>
 +S:    Maintained
 +F:    drivers/gpu/drm/panel/panel-olimex-lcd-olinuxino.c
 +F:    Documentation/devicetree/bindings/display/panel/olimex,lcd-olinuxino.txt
 +
  DRM DRIVER FOR PERVASIVE DISPLAYS REPAPER PANELS
  M:    Noralf Trønnes <[email protected]>
  S:    Maintained
@@@ -4910,8 -4836,10 +4910,8 @@@ T:     git git://anongit.freedesktop.org/dr
  
  DRM DRIVER FOR VMWARE VIRTUAL GPU
  M:    "VMware Graphics" <[email protected]>
 -M:    Sinclair Yeh <[email protected]>
  M:    Thomas Hellstrom <[email protected]>
  L:    [email protected]
 -T:    git git://people.freedesktop.org/~syeh/repos_linux
  T:    git git://people.freedesktop.org/~thomash/linux
  S:    Supported
  F:    drivers/gpu/drm/vmwgfx/
@@@ -4969,7 -4897,7 +4969,7 @@@ F:      Documentation/gpu/meson.rs
  T:    git git://anongit.freedesktop.org/drm/drm-misc
  
  DRM DRIVERS FOR ATMEL HLCDC
 -M:    Boris Brezillon <b[email protected]>
 +M:    Boris Brezillon <b[email protected]>
  L:    [email protected]
  S:    Supported
  F:    drivers/gpu/drm/atmel-hlcdc/
@@@ -5478,6 -5406,7 +5478,6 @@@ S:      Maintaine
  F:    drivers/edac/i82443bxgx_edac.c
  
  EDAC-I82975X
 -M:    Ranganathan Desikan <[email protected]>
  M:    "Arvind R." <[email protected]>
  L:    [email protected]
  S:    Maintained
@@@ -5575,7 -5504,7 +5575,7 @@@ S:      Orpha
  F:    fs/efs/
  
  EHEA (IBM pSeries eHEA 10Gb ethernet adapter) DRIVER
 -M:    Douglas Miller <dougmill@linux.vnet.ibm.com>
 +M:    Douglas Miller <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    drivers/net/ethernet/ibm/ehea/
@@@ -5689,7 -5618,6 +5689,7 @@@ F:      include/linux/of_net.
  F:    include/linux/phy.h
  F:    include/linux/phy_fixed.h
  F:    include/linux/platform_data/mdio-bcm-unimac.h
 +F:    include/linux/platform_data/mdio-gpio.h
  F:    include/trace/events/mdio.h
  F:    include/uapi/linux/mdio.h
  F:    include/uapi/linux/mii.h
@@@ -5714,7 -5642,7 +5714,7 @@@ F:      Documentation/filesystems/ext4/ext4.
  F:    fs/ext4/
  
  Extended Verification Module (EVM)
 -M:    Mimi Zohar <zohar@linux.vnet.ibm.com>
 +M:    Mimi Zohar <[email protected]>
  L:    [email protected]
  S:    Supported
  F:    security/integrity/evm/
@@@ -5924,7 -5852,7 +5924,7 @@@ F:      include/linux/firmware.
  
  FLASH ADAPTER DRIVER (IBM Flash Adapter 900GB Full Height PCI Flash Card)
  M:    Joshua Morris <[email protected]>
 -M:    Philip Kelleher <pjk1939@linux.vnet.ibm.com>
 +M:    Philip Kelleher <[email protected]>
  S:    Maintained
  F:    drivers/block/rsxx/
  
@@@ -6191,7 -6119,7 +6191,7 @@@ F:      include/linux/fscrypt*.
  F:    Documentation/filesystems/fscrypt.rst
  
  FSI-ATTACHED I2C DRIVER
 -M:    Eddie James <eajames@linux.vnet.ibm.com>
 +M:    Eddie James <[email protected]>
  L:    [email protected]
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
@@@ -6338,7 -6266,6 +6338,7 @@@ T:      git git://git.kernel.org/pub/scm/lin
  S:    Supported
  F:    drivers/phy/
  F:    include/linux/phy/
 +F:    Documentation/devicetree/bindings/phy/
  
  GENERIC PINCTRL I2C DEMULTIPLEXER DRIVER
  M:    Wolfram Sang <[email protected]>
@@@ -6368,7 -6295,8 +6368,7 @@@ S:      Supporte
  F:    drivers/uio/uio_pci_generic.c
  
  GENWQE (IBM Generic Workqueue Card)
 -M:    Frank Haverkamp <[email protected]>
 -M:    Guilherme G. Piccoli <[email protected]>
 +M:    Frank Haverkamp <[email protected]>
  S:    Supported
  F:    drivers/misc/genwqe/
  
@@@ -6441,6 -6369,7 +6441,6 @@@ F:      drivers/media/rc/gpio-ir-tx.
  
  GPIO MOCKUP DRIVER
  M:    Bamvor Jian Zhang <[email protected]>
 -R:    Bartosz Golaszewski <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    drivers/gpio/gpio-mockup.c
@@@ -6934,14 -6863,6 +6934,14 @@@ L:    [email protected]
  S:    Maintained
  F:    drivers/input/touchscreen/htcpen.c
  
 +HTS221 TEMPERATURE-HUMIDITY IIO DRIVER
 +M:    Lorenzo Bianconi <[email protected]>
 +L:    [email protected]
 +W:    http://www.st.com/
 +S:    Maintained
 +F:    drivers/iio/humidity/hts221*
 +F:    Documentation/devicetree/bindings/iio/humidity/hts221.txt
 +
  HUAWEI ETHERNET DRIVER
  M:    Aviad Krawczyk <[email protected]>
  L:    [email protected]
@@@ -6985,11 -6906,9 +6985,11 @@@ Hyper-V CORE AND DRIVER
  M:    "K. Y. Srinivasan" <[email protected]>
  M:    Haiyang Zhang <[email protected]>
  M:    Stephen Hemminger <[email protected]>
 +M:    Sasha Levin <[email protected]>
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git
  L:    [email protected]
 -S:    Maintained
 -F:    Documentation/networking/netvsc.txt
 +S:    Supported
 +F:    Documentation/networking/device_drivers/microsoft/netvsc.txt
  F:    arch/x86/include/asm/mshyperv.h
  F:    arch/x86/include/asm/trace/hyperv.h
  F:    arch/x86/include/asm/hyperv-tlfs.h
@@@ -7149,24 -7068,6 +7149,24 @@@ L:    [email protected]
  S:    Maintained
  F:    drivers/i2c/i2c-stub.c
  
 +I3C SUBSYSTEM
 +M:    Boris Brezillon <[email protected]>
 +L:    [email protected]
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/i3c/linux.git
 +S:    Maintained
 +F:    Documentation/ABI/testing/sysfs-bus-i3c
 +F:    Documentation/devicetree/bindings/i3c/
 +F:    Documentation/driver-api/i3c
 +F:    drivers/i3c/
 +F:    include/linux/i3c/
 +F:    include/dt-bindings/i3c/
 +
 +I3C DRIVER FOR SYNOPSYS DESIGNWARE
 +M:    Vitor Soares <[email protected]>
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/i3c/snps,dw-i3c-master.txt
 +F:    drivers/i3c/master/dw*
 +
  IA64 (Itanium) PLATFORM
  M:    Tony Luck <[email protected]>
  M:    Fenghua Yu <[email protected]>
@@@ -7186,9 -7087,8 +7186,9 @@@ F:      crypto/842.
  F:    lib/842/
  
  IBM Power in-Nest Crypto Acceleration
 -M:    Leonidas S. Barbosa <[email protected]>
 -M:    Paulo Flabiano Smorigo <[email protected]>
 +M:    Breno Leitão <[email protected]>
 +M:    Nayna Jain <[email protected]>
 +M:    Paulo Flabiano Smorigo <[email protected]>
  L:    [email protected]
  S:    Supported
  F:    drivers/crypto/nx/Makefile
@@@ -7205,8 -7105,8 +7205,8 @@@ S:      Supporte
  F:    drivers/scsi/ipr.*
  
  IBM Power SRIOV Virtual NIC Device Driver
 -M:    Thomas Falcon <tlfalcon@linux.vnet.ibm.com>
 -M:    John Allen <jallen@linux.vnet.ibm.com>
 +M:    Thomas Falcon <[email protected]>
 +M:    John Allen <[email protected]>
  L:    [email protected]
  S:    Supported
  F:    drivers/net/ethernet/ibm/ibmvnic.*
@@@ -7221,40 -7121,41 +7221,40 @@@ F:   arch/powerpc/include/asm/vas.
  F:    arch/powerpc/include/uapi/asm/vas.h
  
  IBM Power Virtual Ethernet Device Driver
 -M:    Thomas Falcon <tlfalcon@linux.vnet.ibm.com>
 +M:    Thomas Falcon <[email protected]>
  L:    [email protected]
  S:    Supported
  F:    drivers/net/ethernet/ibm/ibmveth.*
  
  IBM Power Virtual FC Device Drivers
 -M:    Tyrel Datwyler <tyreld@linux.vnet.ibm.com>
 +M:    Tyrel Datwyler <[email protected]>
  L:    [email protected]
  S:    Supported
  F:    drivers/scsi/ibmvscsi/ibmvfc*
  
  IBM Power Virtual Management Channel Driver
 -M:    Bryant G. Ly <[email protected]>
 -M:    Steven Royer <[email protected]>
 +M:    Steven Royer <[email protected]>
  S:    Supported
  F:    drivers/misc/ibmvmc.*
  
  IBM Power Virtual SCSI Device Drivers
 -M:    Tyrel Datwyler <tyreld@linux.vnet.ibm.com>
 +M:    Tyrel Datwyler <[email protected]>
  L:    [email protected]
  S:    Supported
  F:    drivers/scsi/ibmvscsi/ibmvscsi*
  F:    include/scsi/viosrp.h
  
  IBM Power Virtual SCSI Device Target Driver
 -M:    Bryant G. Ly <[email protected]>
 -M:    Michael Cyr <[email protected]>
 +M:    Michael Cyr <[email protected]>
  L:    [email protected]
  L:    [email protected]
  S:    Supported
  F:    drivers/scsi/ibmvscsi_tgt/
  
  IBM Power VMX Cryptographic instructions
 -M:    Leonidas S. Barbosa <[email protected]>
 -M:    Paulo Flabiano Smorigo <[email protected]>
 +M:    Breno Leitão <[email protected]>
 +M:    Nayna Jain <[email protected]>
 +M:    Paulo Flabiano Smorigo <[email protected]>
  L:    [email protected]
  S:    Supported
  F:    drivers/crypto/vmx/Makefile
@@@ -7531,7 -7432,7 +7531,7 @@@ S:      Maintaine
  L:    [email protected]
  
  INTEGRITY MEASUREMENT ARCHITECTURE (IMA)
 -M:    Mimi Zohar <zohar@linux.vnet.ibm.com>
 +M:    Mimi Zohar <[email protected]>
  M:    Dmitry Kasatkin <[email protected]>
  L:    [email protected]
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity.git
@@@ -7591,18 -7492,18 +7591,18 @@@ Q:   http://patchwork.ozlabs.org/project/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-queue.git
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/next-queue.git
  S:    Supported
 -F:    Documentation/networking/e100.rst
 -F:    Documentation/networking/e1000.rst
 -F:    Documentation/networking/e1000e.rst
 -F:    Documentation/networking/fm10k.rst
 -F:    Documentation/networking/igb.rst
 -F:    Documentation/networking/igbvf.rst
 -F:    Documentation/networking/ixgb.rst
 -F:    Documentation/networking/ixgbe.rst
 -F:    Documentation/networking/ixgbevf.rst
 -F:    Documentation/networking/i40e.rst
 -F:    Documentation/networking/iavf.rst
 -F:    Documentation/networking/ice.rst
 +F:    Documentation/networking/device_drivers/intel/e100.rst
 +F:    Documentation/networking/device_drivers/intel/e1000.rst
 +F:    Documentation/networking/device_drivers/intel/e1000e.rst
 +F:    Documentation/networking/device_drivers/intel/fm10k.rst
 +F:    Documentation/networking/device_drivers/intel/igb.rst
 +F:    Documentation/networking/device_drivers/intel/igbvf.rst
 +F:    Documentation/networking/device_drivers/intel/ixgb.rst
 +F:    Documentation/networking/device_drivers/intel/ixgbe.rst
 +F:    Documentation/networking/device_drivers/intel/ixgbevf.rst
 +F:    Documentation/networking/device_drivers/intel/i40e.rst
 +F:    Documentation/networking/device_drivers/intel/iavf.rst
 +F:    Documentation/networking/device_drivers/intel/ice.rst
  F:    drivers/net/ethernet/intel/
  F:    drivers/net/ethernet/intel/*/
  F:    include/linux/avf/virtchnl.h
@@@ -7692,14 -7593,6 +7692,14 @@@ S:    Maintaine
  F:    drivers/media/pci/intel/ipu3/
  F:    Documentation/media/uapi/v4l/pixfmt-srggb10-ipu3.rst
  
 +INTEL IPU3 CSI-2 IMGU DRIVER
 +M:    Sakari Ailus <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/staging/media/ipu3/
 +F:    Documentation/media/uapi/v4l/pixfmt-meta-intel-ipu3.rst
 +F:    Documentation/media/v4l-drivers/ipu3.rst
 +
  INTEL IXP4XX QMGR, NPE, ETHERNET and HSS SUPPORT
  M:    Krzysztof Halasa <[email protected]>
  S:    Maintained
@@@ -7784,8 -7677,8 +7784,8 @@@ INTEL PRO/WIRELESS 2100, 2200BG, 2915AB
  M:    Stanislav Yakovlev <[email protected]>
  L:    [email protected]
  S:    Maintained
 -F:    Documentation/networking/README.ipw2100
 -F:    Documentation/networking/README.ipw2200
 +F:    Documentation/networking/device_drivers/intel/ipw2100.txt
 +F:    Documentation/networking/device_drivers/intel/ipw2200.txt
  F:    drivers/net/wireless/intel/ipw2x00/
  
  INTEL PSTATE DRIVER
@@@ -7890,6 -7783,18 +7890,18 @@@ L:    [email protected]
  S:    Maintained
  F:    drivers/tty/serial/ioc3_serial.c
  
+ IOMAP FILESYSTEM LIBRARY
+ M:    Christoph Hellwig <[email protected]>
+ M:    Darrick J. Wong <[email protected]>
+ M:    [email protected]
+ M:    [email protected]
+ L:    [email protected]
+ L:    [email protected]
+ T:    git git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git
+ S:    Supported
+ F:    fs/iomap.c
+ F:    include/linux/iomap.h
+ 
  IOMMU DRIVERS
  M:    Joerg Roedel <[email protected]>
  L:    [email protected]
@@@ -8045,6 -7950,13 +8057,6 @@@ F:     include/linux/isdn
  F:    include/uapi/linux/isdn.h
  F:    include/uapi/linux/isdn/
  
 -ISDN SUBSYSTEM (Eicon active card driver)
 -M:    Armin Schindler <[email protected]>
 -L:    [email protected] (subscribers-only)
 -W:    http://www.melware.de
 -S:    Maintained
 -F:    drivers/isdn/hardware/eicon/
 -
  IT87 HARDWARE MONITORING DRIVER
  M:    Jean Delvare <[email protected]>
  L:    [email protected]
@@@ -8133,8 -8045,9 +8145,8 @@@ S:      Maintaine
  F:    drivers/media/platform/rcar_jpu.c
  
  JSM Neo PCI based serial card
 -M:    Guilherme G. Piccoli <[email protected]>
  L:    [email protected]
 -S:    Maintained
 +S:    Orphan
  F:    drivers/tty/serial/jsm/
  
  K10TEMP HARDWARE MONITORING DRIVER
@@@ -8340,7 -8253,6 +8352,7 @@@ W:      http://www.linux-kvm.or
  T:    git git://git.kernel.org/pub/scm/virt/kvm/kvm.git
  S:    Supported
  F:    arch/x86/kvm/
 +F:    arch/x86/kvm/*/
  F:    arch/x86/include/uapi/asm/kvm*
  F:    arch/x86/include/asm/kvm*
  F:    arch/x86/include/asm/pvclock-abi.h
@@@ -8365,7 -8277,7 +8377,7 @@@ F:      include/uapi/linux/kexec.
  F:    kernel/kexec*
  
  KEYS-ENCRYPTED
 -M:    Mimi Zohar <zohar@linux.vnet.ibm.com>
 +M:    Mimi Zohar <[email protected]>
  L:    [email protected]
  L:    [email protected]
  S:    Supported
@@@ -8374,9 -8286,9 +8386,9 @@@ F:      include/keys/encrypted-type.
  F:    security/keys/encrypted-keys/
  
  KEYS-TRUSTED
 -M:    James Bottomley <jejb@linux.vnet.ibm.com>
 +M:    James Bottomley <[email protected]>
  M:      Jarkko Sakkinen <[email protected]>
 -M:    Mimi Zohar <zohar@linux.vnet.ibm.com>
 +M:    Mimi Zohar <[email protected]>
  L:    [email protected]
  L:    [email protected]
  S:    Supported
@@@ -8429,7 -8341,7 +8441,7 @@@ F:      lib/test_kmod.
  F:    tools/testing/selftests/kmod/
  
  KPROBES
 -M:    Naveen N. Rao <naveen.n.rao@linux.vnet.ibm.com>
 +M:    Naveen N. Rao <[email protected]>
  M:    Anil S Keshavamurthy <[email protected]>
  M:    "David S. Miller" <[email protected]>
  M:    Masami Hiramatsu <[email protected]>
@@@ -8785,7 -8697,7 +8797,7 @@@ M:      Nicholas Piggin <[email protected]
  M:    David Howells <[email protected]>
  M:    Jade Alglave <[email protected]>
  M:    Luc Maranget <[email protected]>
 -M:    "Paul E. McKenney" <paulmck@linux.vnet.ibm.com>
 +M:    "Paul E. McKenney" <[email protected]>
  R:    Akira Yokosawa <[email protected]>
  R:    Daniel Lustig <[email protected]>
  L:    [email protected]
@@@ -9043,7 -8955,7 +9055,7 @@@ F:      arch/mips/boot/dts/img/pistachio_mar
  
  MARVELL 88E6XXX ETHERNET SWITCH FABRIC DRIVER
  M:    Andrew Lunn <[email protected]>
 -M:    Vivien Didelot <vivien.didelot@savoirfairelinux.com>
 +M:    Vivien Didelot <vivien.didelot@gmail.com>
  L:    [email protected]
  S:    Maintained
  F:    drivers/net/dsa/mv88e6xxx/
@@@ -9060,7 -8972,7 +9072,7 @@@ F:      include/uapi/drm/armada_drm.
  F:    Documentation/devicetree/bindings/display/armada/
  
  MARVELL CRYPTO DRIVER
 -M:    Boris Brezillon <b[email protected]>
 +M:    Boris Brezillon <b[email protected]>
  M:    Arnaud Ebalard <[email protected]>
  F:    drivers/crypto/marvell/
  S:    Maintained
@@@ -9548,13 -9460,6 +9560,13 @@@ F:    drivers/media/platform/mtk-vpu
  F:    Documentation/devicetree/bindings/media/mediatek-vcodec.txt
  F:    Documentation/devicetree/bindings/media/mediatek-vpu.txt
  
 +MEDIATEK MT76 WIRELESS LAN DRIVER
 +M:    Felix Fietkau <[email protected]>
 +M:    Lorenzo Bianconi <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/net/wireless/mediatek/mt76/
 +
  MEDIATEK MT7601U WIRELESS LAN DRIVER
  M:    Jakub Kicinski <[email protected]>
  L:    [email protected]
@@@ -9750,7 -9655,7 +9762,7 @@@ F:      drivers/platform/x86/mlx-platform.
  
  MEMBARRIER SUPPORT
  M:    Mathieu Desnoyers <[email protected]>
 -M:    "Paul E. McKenney" <paulmck@linux.vnet.ibm.com>
 +M:    "Paul E. McKenney" <[email protected]>
  L:    [email protected]
  S:    Supported
  F:    kernel/sched/membarrier.c
@@@ -9771,7 -9676,7 +9783,7 @@@ F:      mm
  MEMORY TECHNOLOGY DEVICES (MTD)
  M:    David Woodhouse <[email protected]>
  M:    Brian Norris <[email protected]>
 -M:    Boris Brezillon <b[email protected]>
 +M:    Boris Brezillon <b[email protected]>
  M:    Marek Vasut <[email protected]>
  M:    Richard Weinberger <[email protected]>
  L:    [email protected]
@@@ -9872,14 -9777,14 +9884,14 @@@ L:   [email protected]
  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 ISI DRIVER
  M:    Eugen Hristev <[email protected]>
  L:    [email protected]
  S:    Supported
  F:    drivers/media/platform/atmel/atmel-isi.c
 -F:    include/media/atmel-isi.h
 +F:    drivers/media/platform/atmel/atmel-isi.h
  
  MICROCHIP AT91 USART MFD DRIVER
  M:    Radu Pirea <[email protected]>
@@@ -9925,13 -9830,6 +9937,13 @@@ M:    Ludovic Desroches <ludovic.desroches
  S:    Maintained
  F:    drivers/mmc/host/atmel-mci.c
  
 +MICROCHIP MCP16502 PMIC DRIVER
 +M:    Andrei Stefanescu <[email protected]>
 +L:    [email protected] (moderated for non-subscribers)
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/regulator/mcp16502-regulator.txt
 +F:    drivers/regulator/mcp16502.c
 +
  MICROCHIP MCP3911 ADC DRIVER
  M:    Marcus Folkesson <[email protected]>
  M:    Kent Gustavsson <[email protected]>
@@@ -9969,12 -9867,6 +9981,12 @@@ M:    Nicolas Ferre <nicolas.ferre@microch
  S:    Supported
  F:    drivers/power/reset/at91-sama5d2_shdwc.c
  
 +MICROCHIP SAMA5D2-COMPATIBLE PIOBU GPIO
 +M:    Andrei Stefanescu <[email protected]>
 +L:    [email protected] (moderated for non-subscribers)
 +L:    [email protected]
 +F:    drivers/gpio/gpio-sama5d2-piobu.c
 +
  MICROCHIP SPI DRIVER
  M:    Nicolas Ferre <[email protected]>
  S:    Supported
@@@ -10016,9 -9908,8 +10028,9 @@@ F:    drivers/dma/at_xdmac.
  
  MICROSEMI MIPS SOCS
  M:    Alexandre Belloni <[email protected]>
 +M:    Microchip Linux Driver Support <[email protected]>
  L:    [email protected]
 -S:    Maintained
 +S:    Supported
  F:    arch/mips/generic/board-ocelot.c
  F:    arch/mips/configs/generic/board-ocelot.config
  F:    arch/mips/boot/dts/mscc/
@@@ -10038,7 -9929,6 +10050,7 @@@ F:    Documentation/scsi/smartpqi.tx
  
  MICROSEMI ETHERNET SWITCH DRIVER
  M:    Alexandre Belloni <[email protected]>
 +M:    Microchip Linux Driver Support <[email protected]>
  L:    [email protected]
  S:    Supported
  F:    drivers/net/ethernet/mscc/
@@@ -10373,7 -10263,7 +10385,7 @@@ S:   Supporte
  F:    drivers/net/ethernet/myricom/myri10ge/
  
  NAND FLASH SUBSYSTEM
 -M:    Boris Brezillon <b[email protected]>
 +M:    Boris Brezillon <b[email protected]>
  M:    Miquel Raynal <[email protected]>
  R:    Richard Weinberger <[email protected]>
  L:    [email protected]
@@@ -10450,8 -10340,8 +10462,8 @@@ NETERION 10GbE DRIVERS (s2io/vxge
  M:    Jon Mason <[email protected]>
  L:    [email protected]
  S:    Supported
 -F:    Documentation/networking/s2io.txt
 -F:    Documentation/networking/vxge.txt
 +F:    Documentation/networking/device_drivers/neterion/s2io.txt
 +F:    Documentation/networking/device_drivers/neterion/vxge.txt
  F:    drivers/net/ethernet/neterion/
  
  NETFILTER
@@@ -10540,7 -10430,7 +10552,7 @@@ F:   drivers/net/wireless
  
  NETWORKING [DSA]
  M:    Andrew Lunn <[email protected]>
 -M:    Vivien Didelot <vivien.didelot@savoirfairelinux.com>
 +M:    Vivien Didelot <vivien.didelot@gmail.com>
  M:    Florian Fainelli <[email protected]>
  S:    Maintained
  F:    Documentation/devicetree/bindings/net/dsa/
@@@ -10893,14 -10783,6 +10905,14 @@@ L: [email protected] (moderated fo
  S:    Supported
  F:    drivers/nfc/nxp-nci
  
 +OBJAGG
 +M:    Jiri Pirko <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +F:    lib/objagg.c
 +F:    lib/test_objagg.c
 +F:    include/linux/objagg.h
 +
  OBJTOOL
  M:    Josh Poimboeuf <[email protected]>
  M:    Peter Zijlstra <[email protected]>
@@@ -10908,7 -10790,7 +10920,7 @@@ S:   Supporte
  F:    tools/objtool/
  
  OCXL (Open Coherent Accelerator Processor Interface OpenCAPI) DRIVER
 -M:    Frederic Barrat <fbarrat@linux.vnet.ibm.com>
 +M:    Frederic Barrat <[email protected]>
  M:    Andrew Donnellan <[email protected]>
  L:    [email protected]
  S:    Supported
@@@ -10925,10 -10807,7 +10937,10 @@@ M: Jarkko Nikula <jarkko.nikula@bitmer.
  L:    [email protected] (moderated for non-subscribers)
  L:    [email protected]
  S:    Maintained
 -F:    sound/soc/omap/
 +F:    sound/soc/ti/omap*
 +F:    sound/soc/ti/rx51.c
 +F:    sound/soc/ti/n810.c
 +F:    sound/soc/ti/sdma-pcm.*
  
  OMAP CLOCK FRAMEWORK SUPPORT
  M:    Paul Walmsley <[email protected]>
@@@ -11936,12 -11815,18 +11948,12 @@@ F:        Documentation/driver-api/pinctl.rs
  F:    drivers/pinctrl/
  F:    include/linux/pinctrl/
  
 -PIN CONTROLLER - ATMEL AT91
 -M:    Jean-Christophe Plagniol-Villard <[email protected]>
 -L:    [email protected] (moderated for non-subscribers)
 -S:    Maintained
 -F:    drivers/pinctrl/pinctrl-at91.*
 -
 -PIN CONTROLLER - ATMEL AT91 PIO4
 +PIN CONTROLLER - MICROCHIP AT91
  M:    Ludovic Desroches <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  L:    [email protected]
  S:    Supported
 -F:    drivers/pinctrl/pinctrl-at91-pio4.*
 +F:    drivers/pinctrl/pinctrl-at91*
  
  PIN CONTROLLER - FREESCALE
  M:    Dong Aisheng <[email protected]>
@@@ -11977,11 -11862,11 +11989,11 @@@ F:        Documentation/devicetree/bindings/pi
  F:    drivers/pinctrl/qcom/
  
  PIN CONTROLLER - RENESAS
 -M:    Laurent Pinchart <[email protected]>
  M:    Geert Uytterhoeven <[email protected]>
  L:    [email protected]
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git sh-pfc
  S:    Maintained
 +F:    drivers/pinctrl/pinctrl-rz*
  F:    drivers/pinctrl/sh-pfc/
  
  PIN CONTROLLER - SAMSUNG
@@@ -12086,13 -11971,6 +12098,13 @@@ M: "Rafael J. Wysocki" <rafael.j.wysock
  S:    Maintained
  F:    drivers/pnp/
  
 +PNI RM3100 IIO DRIVER
 +M:    Song Qiang <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/iio/magnetometer/rm3100*
 +F:    Documentation/devicetree/bindings/iio/magnetometer/pni,rm3100.txt
 +
  POSIX CLOCKS and TIMERS
  M:    Thomas Gleixner <[email protected]>
  L:    [email protected]
@@@ -12465,7 -12343,7 +12477,7 @@@ QLOGIC QLA3XXX NETWORK DRIVE
  M:    [email protected]
  L:    [email protected]
  S:    Supported
 -F:    Documentation/networking/LICENSE.qla3xxx
 +F:    Documentation/networking/device_drivers/qlogic/LICENSE.qla3xxx
  F:    drivers/net/ethernet/qlogic/qla3xxx.*
  
  QLOGIC QLA4XXX iSCSI DRIVER
@@@ -12517,7 -12395,7 +12529,7 @@@ L:   [email protected]
  S:    Maintained
  F:    drivers/bus/fsl-mc/
  F:    Documentation/devicetree/bindings/misc/fsl,qoriq-mc.txt
 -F:    Documentation/networking/dpaa2/overview.rst
 +F:    Documentation/networking/device_drivers/freescale/dpaa2/overview.rst
  
  QT1010 MEDIA DRIVER
  M:    Antti Palosaari <[email protected]>
@@@ -12545,7 -12423,7 +12557,7 @@@ S:   Supporte
  F:    drivers/net/wireless/ath/ath9k/
  
  QUALCOMM CAMERA SUBSYSTEM DRIVER
 -M:    Todor Tomov <todor.to[email protected]>
 +M:    Todor Tomov <todor.to[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    Documentation/devicetree/bindings/media/qcom,camss.txt
@@@ -12595,13 -12473,6 +12607,13 @@@ L: [email protected]
  S:    Maintained
  F:    drivers/iommu/qcom_iommu.c
  
 +QUALCOMM TSENS THERMAL DRIVER
 +M:    Amit Kucheria <[email protected]>
 +L:    [email protected]
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/thermal/qcom/
 +
  QUALCOMM VENUS VIDEO ACCELERATOR DRIVER
  M:    Stanimir Varbanov <[email protected]>
  L:    [email protected]
@@@ -12730,7 -12601,7 +12742,7 @@@ S:   Orpha
  F:    drivers/net/wireless/ray*
  
  RCUTORTURE TEST FRAMEWORK
 -M:    "Paul E. McKenney" <paulmck@linux.vnet.ibm.com>
 +M:    "Paul E. McKenney" <[email protected]>
  M:    Josh Triplett <[email protected]>
  R:    Steven Rostedt <[email protected]>
  R:    Mathieu Desnoyers <[email protected]>
@@@ -12772,17 -12643,16 +12784,17 @@@ M:        Fenghua Yu <[email protected]
  M:    Reinette Chatre <[email protected]>
  L:    [email protected]
  S:    Supported
 -F:    arch/x86/kernel/cpu/intel_rdt*
 -F:    arch/x86/include/asm/intel_rdt_sched.h
 -F:    Documentation/x86/intel_rdt*
 +F:    arch/x86/kernel/cpu/resctrl/
 +F:    arch/x86/include/asm/resctrl_sched.h
 +F:    Documentation/x86/resctrl*
  
  READ-COPY UPDATE (RCU)
 -M:    "Paul E. McKenney" <paulmck@linux.vnet.ibm.com>
 +M:    "Paul E. McKenney" <[email protected]>
  M:    Josh Triplett <[email protected]>
  R:    Steven Rostedt <[email protected]>
  R:    Mathieu Desnoyers <[email protected]>
  R:    Lai Jiangshan <[email protected]>
 +R:    Joel Fernandes <[email protected]>
  L:    [email protected]
  W:    http://www.rdrop.com/users/paulmck/RCU/
  S:    Supported
@@@ -12885,8 -12755,7 +12897,8 @@@ RENESAS R-CAR GYROADC DRIVE
  M:    Marek Vasut <[email protected]>
  L:    [email protected]
  S:    Supported
 -F:    drivers/iio/adc/rcar_gyro_adc.c
 +F:    Documentation/devicetree/bindings/iio/adc/renesas,gyroadc.txt
 +F:    drivers/iio/adc/rcar-gyroadc.c
  
  RENESAS R-CAR I2C DRIVERS
  M:    Wolfram Sang <[email protected]>
@@@ -12919,7 -12788,7 +12931,7 @@@ F:   include/linux/reset-controller.
  RESTARTABLE SEQUENCES SUPPORT
  M:    Mathieu Desnoyers <[email protected]>
  M:    Peter Zijlstra <[email protected]>
 -M:    "Paul E. McKenney" <paulmck@linux.vnet.ibm.com>
 +M:    "Paul E. McKenney" <[email protected]>
  M:    Boqun Feng <[email protected]>
  L:    [email protected]
  S:    Supported
@@@ -12987,13 -12856,6 +12999,13 @@@ S: Maintaine
  F:    drivers/media/platform/rockchip/rga/
  F:    Documentation/devicetree/bindings/media/rockchip-rga.txt
  
 +ROCKCHIP VPU CODEC DRIVER
 +M:    Ezequiel Garcia <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/staging/media/platform/rockchip/vpu/
 +F:    Documentation/devicetree/bindings/media/rockchip-vpu.txt
 +
  ROCKER DRIVER
  M:    Jiri Pirko <[email protected]>
  L:    [email protected]
@@@ -13178,9 -13040,7 +13190,9 @@@ F:   drivers/pci/hotplug/s390_pci_hpc.
  
  S390 VFIO-CCW DRIVER
  M:    Cornelia Huck <[email protected]>
 -M:    Halil Pasic <[email protected]>
 +M:    Farhan Ali <[email protected]>
 +M:    Eric Farman <[email protected]>
 +R:    Halil Pasic <[email protected]>
  L:    [email protected]
  L:    [email protected]
  S:    Supported
@@@ -13245,7 -13105,7 +13257,7 @@@ T:   git git://linuxtv.org/media_tree.gi
  S:    Maintained
  F:    drivers/media/common/saa7146/
  F:    drivers/media/pci/saa7146/
 -F:    include/media/saa7146*
 +F:    include/media/drv-intf/saa7146*
  
  SAMSUNG AUDIO (ASoC) DRIVERS
  M:    Krzysztof Kozlowski <[email protected]>
@@@ -13453,7 -13313,7 +13465,7 @@@ F:   drivers/scsi/sg.
  F:    include/scsi/sg.h
  
  SCSI SUBSYSTEM
 -M:    "James E.J. Bottomley" <jejb@linux.vnet.ibm.com>
 +M:    "James E.J. Bottomley" <[email protected]>
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git
  M:    "Martin K. Petersen" <[email protected]>
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git
@@@ -13511,12 -13371,6 +13523,12 @@@ L: [email protected]
  S:    Maintained
  F:    drivers/mmc/host/sdricoh_cs.c
  
 +SECO BOARDS CEC DRIVER
 +M:    Ettore Chimenti <[email protected]>
 +S:    Maintained
 +F:    drivers/media/platform/seco-cec/seco-cec.c
 +F:    drivers/media/platform/seco-cec/seco-cec.h
 +
  SECURE COMPUTING
  M:    Kees Cook <[email protected]>
  R:    Andy Lutomirski <[email protected]>
@@@ -13894,7 -13748,7 +13906,7 @@@ F:   mm/sl?b
  
  SLEEPABLE READ-COPY UPDATE (SRCU)
  M:    Lai Jiangshan <[email protected]>
 -M:    "Paul E. McKenney" <paulmck@linux.vnet.ibm.com>
 +M:    "Paul E. McKenney" <[email protected]>
  M:    Josh Triplett <[email protected]>
  R:    Steven Rostedt <[email protected]>
  R:    Mathieu Desnoyers <[email protected]>
@@@ -14090,14 -13944,6 +14102,14 @@@ S: Maintaine
  F:    drivers/ssb/
  F:    include/linux/ssb/
  
 +SONY IMX214 SENSOR DRIVER
 +M:    Ricardo Ribalda <[email protected]>
 +L:    [email protected]
 +T:    git git://linuxtv.org/media_tree.git
 +S:    Maintained
 +F:    drivers/media/i2c/imx214.c
 +F:    Documentation/devicetree/bindings/media/i2c/sony,imx214.txt
 +
  SONY IMX258 SENSOR DRIVER
  M:    Sakari Ailus <[email protected]>
  L:    [email protected]
@@@ -14289,7 -14135,7 +14301,7 @@@ SPIDERNET NETWORK DRIVER for CEL
  M:    Ishizaki Kou <[email protected]>
  L:    [email protected]
  S:    Supported
 -F:    Documentation/networking/spider_net.txt
 +F:    Documentation/networking/device_drivers/toshiba/spider_net.txt
  F:    drivers/net/ethernet/toshiba/spider_net*
  
  SPMI SUBSYSTEM
@@@ -14323,14 -14169,6 +14335,14 @@@ M: Jan-Benedict Glaw <[email protected]
  S:    Maintained
  F:    arch/alpha/kernel/srm_env.c
  
 +ST LSM6DSx IMU IIO DRIVER
 +M:    Lorenzo Bianconi <[email protected]>
 +L:    [email protected]
 +W:    http://www.st.com/
 +S:    Maintained
 +F:    drivers/iio/imu/st_lsm6dsx/
 +F:    Documentation/devicetree/bindings/iio/imu/st_lsm6dsx.txt
 +
  ST STM32 I2C/SMBUS DRIVER
  M:    Pierre-Yves MORDRET <[email protected]>
  L:    [email protected]
@@@ -14416,8 -14254,8 +14428,8 @@@ S:   Odd Fixe
  F:    drivers/staging/vt665?/
  
  STAGING - WILC1000 WIFI DRIVER
 -M:    Aditya Shankar <aditya.shankar@microchip.com>
 -M:    Ganesh Krishna <ganesh.krishna@microchip.com>
 +M:    Adham Abozaeid <adham.abozaeid@microchip.com>
 +M:    Ajay Singh <ajay.kathat@microchip.com>
  L:    [email protected]
  S:    Supported
  F:    drivers/staging/wilc1000/
@@@ -14647,11 -14485,9 +14659,11 @@@ SYNOPSYS DESIGNWARE DMAC DRIVE
  M:    Viresh Kumar <[email protected]>
  R:    Andy Shevchenko <[email protected]>
  S:    Maintained
 +F:    Documentation/devicetree/bindings/dma/snps-dma.txt
 +F:    drivers/dma/dw/
 +F:    include/dt-bindings/dma/dw-dmac.h
  F:    include/linux/dma/dw.h
  F:    include/linux/platform_data/dma-dw.h
 -F:    drivers/dma/dw/
  
  SYNOPSYS DESIGNWARE ENTERPRISE ETHERNET DRIVER
  M:    Jose Abreu <[email protected]>
@@@ -15015,12 -14851,6 +15027,12 @@@ F: Documentation/devicetree/bindings/cl
  F:    drivers/clk/keystone/sci-clk.c
  F:    drivers/reset/reset-ti-sci.c
  
 +Texas Instruments ASoC drivers
 +M:    Peter Ujfalusi <[email protected]>
 +L:    [email protected] (moderated for non-subscribers)
 +S:    Maintained
 +F:    sound/soc/ti/
 +
  THANKO'S RAREMONO AM/FM/SW RADIO RECEIVER USB DRIVER
  M:    Hans Verkuil <[email protected]>
  L:    [email protected]
@@@ -15295,7 -15125,7 +15307,7 @@@ M:   Samuel Chessman <[email protected]
  L:    [email protected] (subscribers-only)
  W:    http://sourceforge.net/projects/tlan/
  S:    Maintained
 -F:    Documentation/networking/tlan.txt
 +F:    Documentation/networking/device_drivers/ti/tlan.txt
  F:    drivers/net/ethernet/ti/tlan.*
  
  TM6000 VIDEO4LINUX DRIVER
@@@ -15349,7 -15179,7 +15361,7 @@@ F:   drivers/platform/x86/topstar-laptop.
  
  TORTURE-TEST MODULES
  M:    Davidlohr Bueso <[email protected]>
 -M:    "Paul E. McKenney" <paulmck@linux.vnet.ibm.com>
 +M:    "Paul E. McKenney" <[email protected]>
  M:    Josh Triplett <[email protected]>
  L:    [email protected]
  S:    Supported
@@@ -15967,16 -15797,15 +15979,16 @@@ F:        drivers/media/usb/zr364xx
  USER-MODE LINUX (UML)
  M:    Jeff Dike <[email protected]>
  M:    Richard Weinberger <[email protected]>
 +M:    Anton Ivanov <[email protected]>
  L:    [email protected]
  W:    http://user-mode-linux.sourceforge.net
 +Q:    https://patchwork.ozlabs.org/project/linux-um/list/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml.git
  S:    Maintained
  F:    Documentation/virtual/uml/
  F:    arch/um/
  F:    arch/x86/um/
  F:    fs/hostfs/
 -F:    fs/hppfs/
  
  USERSPACE COPYIN/COPYOUT (UIOVEC)
  M:    Alexander Viro <[email protected]>
@@@ -16269,7 -16098,7 +16281,7 @@@ F:   drivers/vme
  F:    include/linux/vme*
  
  VMWARE BALLOON DRIVER
 -M:    Xavier Deguillard <xdeguillard@vmware.com>
 +M:    Julien Freche <jfreche@vmware.com>
  M:    Nadav Amit <[email protected]>
  M:    "VMware, Inc." <[email protected]>
  L:    [email protected]
@@@ -16609,12 -16438,6 +16621,12 @@@ F: include/linux/idr.
  F:    include/linux/xarray.h
  F:    tools/testing/radix-tree
  
 +XBOX DVD IR REMOTE
 +M:    Benjamin Valentin <[email protected]>
 +S:    Maintained
 +F:    drivers/media/rc/xbox_remote.c
 +F:    drivers/media/rc/keymaps/rc-xbox-dvd.c
 +
  XC2028/3028 TUNER DRIVER
  M:    Mauro Carvalho Chehab <[email protected]>
  L:    [email protected]
@@@ -16661,7 -16484,6 +16673,7 @@@ L:   [email protected] (mode
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip.git
  S:    Supported
  F:    arch/x86/xen/
 +F:    arch/x86/platform/pvh/
  F:    drivers/*/xen-*front.c
  F:    drivers/xen/
  F:    arch/x86/include/asm/xen/