Merge tag 'iio-for-4.18a' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23...

Jonathan writes:

1st round of IIO new device support, features and cleanup for the 4.18 cycle

A nice mix this time of excellent cleanups (many to send drivers
speeding toward staging graduations) and new drivers / device support.
A good part of this is Brian Masney's never ending task on the tsl2x7x
driver.  The end is in sight so hopefully we'll get that one out of
staging very soon!

New device support
* AD5686
  - Support AD5685R (was wrongly present as AD5685)
  - Support AD5672R, AD5676, AD5676, AD5684R and AD5686R 4 and 8 channel
    SPI DACs with various precisions.
  - Support AD5671R, AD5675R, AD5694, AD5694R, AD5695R, AD5696 and AD5696R
    I2C DACs with various percisions and numbers of channels.
* Analog front end rescale driver - New driver.
  - Support current sensing usings a shunt resistor.
  - Support simple voltage dividers.
  - support simple current sense amplifiers.
* TI dac5571
  - New driver and device bindings supporting:
    dac5571, dac6571, dac7571, dac5574, dac6574, dac7574,
    dac5573, dac6573 and dac7573
* Meson-adc
  - Support for Meson AXG with DT bindings.
* mpu6050
  - Support the mpu9255 which only requires additional WHOAMI entry and
    compatible string.
* st_lsm6dsx
  - Support for lsm330dlc combinded accelerometer and gyro sensors with
    DT bindings.
* stm32_adc
  - Add support for STM32MP1 with bindings.

Staging graduations
* adis16201 after some excelent cleanup by Himanshu Jha.
* adis16029 after some excelent cleanup by Shreeya Patel.

New features:
* ABI docs
  - Add core ABI docs for angle channels.
* inv_mpu6050
  - Provide support for the full range of interrupts the device
    supports.
* st_accel
  - Add SMO8840 ACPI ID seen in the wild on some Lenovo machines.
* stx104
  - Provide a multiple gpio get function.

Cleanups / Minor fixes
* core
  - Use new nested structure support to improve kernel-doc.
* ad2s1200
  - Use be16_to_cpup instead of opencoding.
* ad5686
  - Indentation tidy up.
  - Switch to SPDX
  - Refactor to allow various numbers of channels.
  - Refactor to separate core and SPI specific support, prior to
    addition of i2c equivalent devices.
* ad7606
  - Use drvdata directly from device rather than boucing via the
    platform_device structure.
* ad7746
  - Replace opencoded byte swapped i2c calls with _swapped variants.
  - White space and line break readability improvements.
  - Reorder includes and variable declarations where appropriate.
* ad7791
  - Changes to the AD ADC library used by this driver took in the
    sampling frequency.  This lead to be the wrong path being the one
    tied to the resulting attribute, so it didn't work, and a warning
    to be printed.
* ad7780
  - Remove apparent support for sampling frequency control on devices
    that don't support changing the sampling attributes.
* ade7854
  - Fix a read of the wrong number of bits.
  - Improve error handling on i2c read/write errors.
  - Rework i2c and spi code to reduce duplication.
* adis16201 (staging)
  - Improve meaning inherent in some macro names by adding units etc
    where relevant.
  - Adjust comments to improve detail and drop the irrelevant.
  - Rename register address definitions definitions to add a _REG
    postfix, clearly separating them from field definitions. Reorganize
    the definitions to group register address and fields.
  - Use sign_extend32 rather than open coding.
  - Reverse Xmas tree ordering where appropriate and align function args.
  - Remove unused headers.
  - Use GENMASK where appropriate instead of open coding.
* adis16209 (staging)
  - Indent field definitions to visually separate them from
    register address definitions.
  - Use reverse xmas tree ordering where appropriate.
  - Add some whitespace where it will help readability.
  - Drop some unused headers.
  - Use GENMASK where appropriate.
* ad2s1200
  - Drop unnecessary includes and reorder alphabetically.
  - Reverse xmas tree and blank line cleanups.
* atlas-ph-sensor
  - Use msleep instead of usleep_range where the precise value doesn't
    matter and the delays are long.
* bcm150
  - Drop transaction splitting as core now handles it.
* cros_ec
  - Move the shared header to the include/iio/common directory.
    This brings it inline with the other multiple type devices.
  - Use drvdata directly from device rather than boucing via the
    platform_device structure.
* hid-sensors
  - Use drvdata directly from device rather than boucing via the
    platform_device structure.
* inv_mpu6050
  - Clear out a second function definition for the same function.
  - Don't flush fifo when the iio buffer is full but just drop excess
    data.
  - Tidy up set_power_itg and ensure it is used in the right places.
  - Use set_power_itg rather than opencoding it again in the i2c mux
    control.
  - Make sure error paths disable the power if undoing power on.
  - Used managed devm_ functions during probe. Delete remove function.
  - Refactor to pull raw data read out of read_raw function.
  - Simplify data reading error paths.
  - Only enable the i2c mux for chips with the i2c aux bus (not icm20608)
  - Fix a potential deadlock due to varying lock ordering.
  - Fix an issue where first sample from gyro after enabling is unstable
    by dropping the first sample.
  - Fix an issue where the user_ctrl register is incorrectly overwritten.
  - Tidy up some grammar and spelling minor issus.
* mcp320x
  - Use vendor compatible strings.
* mcp4018
  - Switch to using i2c .probe_new.
* mcp4351
  - switch to using i2c .probe_new.
* meson-adc
  - rework handing on common ADC platform data so it can be shared
    across multiple families of SoCs.
* sca3000
  - Fix an error handling path if the ring configure fails.
* st_lsm6dsx
  - Fix a wrong fifo threshold mask (no actual effect)
* stm32-dfsdm
  - Style fixes and cleanups.
  - Check filter ID is in range and check spi-max-frequency.
* tsl2x7x (staging)
  - Drop some unnecessary function calls, unused variables and
    unnecessary local variables.
  - Fix wrong interrupt type.
  - Avoid unnecessary double clear of interrupt.
  - Simplify proximity calibration call which did various things
    unrelated to actually calibrating.
  - Separate control of the proximity and ALS interrupts.
  - Improve consistency of logging.
  - Separate ALS and proximity persistence settings as they have
    separate hardware controls.
  - Tidy up variable ordering.
  - Add Brian to copyright notice given consider work on this driver.
  - Take advantage of hardware support for I2C address auto increment.
  - Combine individuaal enable and period attributes for the two
    directions on the threshold events into a single value as the
    hardware doesn't separate them.
  - Move integration_time* attributes from light channel to
    intensity value as they effect the intensity readings directly
    and the light reading only indirectly.  Hence this better
    reflects reality. Also move the calibscale_available.
  - Avoid returning an error in the IRQ handler.
  - Hard code the reg value in _clear_interrupts as it only takes
    one value in the code.   Result is the function has little
    purpose so opencode the two remaining i2c_smbus_write_byte
    calls.
  - Drop some unnecessary checking of the chip status register.
  - Tidy up return path in _write_interrupt_config.
  - Tidy up the ID verification code.
  - Move the power and diode settings defines into the header as these
    are needed for platform data configuration.
  - Various renames and comment cleanups for consistency and clarity.
  - Use actual device defaults for default startup settings.
  - SPDX
  - Add some range sanity checking to sysfs attribute writes.
  - Don't provide event interfaces if the interrupt line isn't available.
  - Use IIO_CONST_ATTR macro for calibscale_available as it's a constant
    string.
  - Fix the integration time and lux equations.
  - Make device IDs explicit index values in the device_channel_config array.

diff --combined MAINTAINERS
index afc87293d7869d38863102eeac19dce7fd824ca9,ad4c68af122a10002ad4e7db60d9571a19027309..4b65225d443ad783ff991cf15a8aa92641d3c167
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -564,9 -564,8 +564,9 @@@ S: Maintaine
  F:    drivers/media/dvb-frontends/af9033*
  
  AFFS FILE SYSTEM
 +M:    David Sterba <dsterba@suse.com>
  L:    linux-fsdevel@vger.kernel.org
 -S:    Orphan
 +S:    Odd Fixes
  F:    Documentation/filesystems/affs.txt
  F:    fs/affs/
  
@@@ -767,8 -766,6 +767,8 @@@ F: drivers/gpu/drm/amd/amdgpu/amdgpu_am
  F:    drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h
  F:    drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v7.c
  F:    drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v8.c
 +F:    drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_fence.c
 +F:    drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c
  F:    drivers/gpu/drm/amd/amdkfd/
  F:    drivers/gpu/drm/amd/include/cik_structs.h
  F:    drivers/gpu/drm/amd/include/kgd_kfd_interface.h
@@@ -794,6 -791,14 +794,14 @@@ M:       Michael Hanselmann <linux-kernel@han
  S:    Supported
  F:    drivers/macintosh/ams/
  
+ ANALOG DEVICES INC AD5686 DRIVER
+ M:    Stefan Popa <stefan.popa@analog.com>
+ L:    linux-pm@vger.kernel.org
+ W:    http://ez.analog.com/community/linux-device-drivers
+ S:    Supported
+ F:    drivers/iio/dac/ad5686*
+ F:    drivers/iio/dac/ad5696*
+ 
  ANALOG DEVICES INC AD9389B DRIVER
  M:    Hans Verkuil <hans.verkuil@cisco.com>
  L:    linux-media@vger.kernel.org
@@@ -844,6 -849,13 +852,6 @@@ F:        sound/soc/codecs/ad7
  F:    sound/soc/codecs/ssm*
  F:    sound/soc/codecs/sigmadsp.*
  
 -ANALOG DEVICES INC ASOC DRIVERS
 -L:    adi-buildroot-devel@lists.sourceforge.net (moderated for non-subscribers)
 -L:    alsa-devel@alsa-project.org (moderated for non-subscribers)
 -W:    http://blackfin.uclinux.org/
 -S:    Supported
 -F:    sound/soc/blackfin/*
 -
  ANALOG DEVICES INC DMA DRIVERS
  M:    Lars-Peter Clausen <lars@metafoo.de>
  W:    http://ez.analog.com/community/linux-device-drivers
@@@ -862,17 -874,7 +870,17 @@@ F:       drivers/iio/*/ad
  F:    drivers/iio/adc/ltc2497*
  X:    drivers/iio/*/adjd*
  F:    drivers/staging/iio/*/ad*
 -F:    drivers/staging/iio/trigger/iio-trig-bfin-timer.c
 +
 +ANDES ARCHITECTURE
 +M:    Greentime Hu <green.hu@gmail.com>
 +M:    Vincent Chen <deanbo422@gmail.com>
 +T:    git https://github.com/andestech/linux.git
 +S:    Supported
 +F:    arch/nds32/
 +F:    Documentation/devicetree/bindings/interrupt-controller/andestech,ativic32.txt
 +F:    Documentation/devicetree/bindings/nds32/
 +K:    nds32
 +N:    nds32
  
  ANDROID CONFIG FRAGMENTS
  M:    Rob Herring <robh@kernel.org>
@@@ -906,8 -908,6 +914,8 @@@ ANDROID ION DRIVE
  M:    Laura Abbott <labbott@redhat.com>
  M:    Sumit Semwal <sumit.semwal@linaro.org>
  L:    devel@driverdev.osuosl.org
 +L:    dri-devel@lists.freedesktop.org
 +L:    linaro-mm-sig@lists.linaro.org (moderated for non-subscribers)
  S:    Supported
  F:    drivers/staging/android/ion
  F:    drivers/staging/android/uapi/ion.h
@@@ -937,8 -937,8 +945,8 @@@ F: drivers/char/apm-emulation.
  APPARMOR SECURITY MODULE
  M:    John Johansen <john.johansen@canonical.com>
  L:    apparmor@lists.ubuntu.com (subscribers-only, general discussion)
 -W:    apparmor.wiki.kernel.org
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jj/apparmor-dev.git
 +W:    wiki.apparmor.net
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jj/linux-apparmor
  S:    Supported
  F:    security/apparmor/
  F:    Documentation/admin-guide/LSM/apparmor.rst
@@@ -1068,42 -1068,41 +1076,42 @@@ ARM POR
  M:    Russell King <linux@armlinux.org.uk>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  W:    http://www.armlinux.org.uk/
 -S:    Maintained
 +S:    Odd Fixes
  T:    git git://git.armlinux.org.uk/~rmk/linux-arm.git
  F:    arch/arm/
 +X:    arch/arm/boot/dts/
  
  ARM PRIMECELL AACI PL041 DRIVER
  M:    Russell King <linux@armlinux.org.uk>
 -S:    Maintained
 +S:    Odd Fixes
  F:    sound/arm/aaci.*
  
  ARM PRIMECELL BUS SUPPORT
  M:    Russell King <linux@armlinux.org.uk>
 -S:    Maintained
 +S:    Odd Fixes
  F:    drivers/amba/
  F:    include/linux/amba/bus.h
  
  ARM PRIMECELL CLCD PL110 DRIVER
  M:    Russell King <linux@armlinux.org.uk>
 -S:    Maintained
 +S:    Odd Fixes
  F:    drivers/video/fbdev/amba-clcd.*
  
  ARM PRIMECELL KMI PL050 DRIVER
  M:    Russell King <linux@armlinux.org.uk>
 -S:    Maintained
 +S:    Odd Fixes
  F:    drivers/input/serio/ambakmi.*
  F:    include/linux/amba/kmi.h
  
  ARM PRIMECELL MMCI PL180/1 DRIVER
  M:    Russell King <linux@armlinux.org.uk>
 -S:    Maintained
 +S:    Odd Fixes
  F:    drivers/mmc/host/mmci.*
  F:    include/linux/amba/mmci.h
  
  ARM PRIMECELL UART PL010 AND PL011 DRIVERS
  M:    Russell King <linux@armlinux.org.uk>
 -S:    Maintained
 +S:    Odd Fixes
  F:    drivers/tty/serial/amba-pl01*.c
  F:    include/linux/amba/serial.h
  
@@@ -1161,7 -1160,7 +1169,7 @@@ S:      Maintaine
  F:    drivers/clk/sunxi/
  
  ARM/Allwinner sunXi SoC support
 -M:    Maxime Ripard <maxime.ripard@free-electrons.com>
 +M:    Maxime Ripard <maxime.ripard@bootlin.com>
  M:    Chen-Yu Tsai <wens@csie.org>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Maintained
@@@ -1211,6 -1210,7 +1219,6 @@@ F:      drivers/*/*alpine
  ARM/ARTPEC MACHINE SUPPORT
  M:    Jesper Nilsson <jesper.nilsson@axis.com>
  M:    Lars Persson <lars.persson@axis.com>
 -M:    Niklas Cassel <niklas.cassel@axis.com>
  S:    Maintained
  L:    linux-arm-kernel@axis.com
  F:    arch/arm/mach-artpec
@@@ -1234,21 -1234,37 +1242,21 @@@ F:   Documentation/devicetree/bindings/i2
  
  ARM/ASPEED MACHINE SUPPORT
  M:    Joel Stanley <joel@jms.id.au>
 -S:    Maintained
 +R:    Andrew Jeffery <andrew@aj.id.au>
 +L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 +L:    linux-aspeed@lists.ozlabs.org (moderated for non-subscribers)
 +Q:    https://patchwork.ozlabs.org/project/linux-aspeed/list/
 +S:    Supported
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/joel/aspeed.git
  F:    arch/arm/mach-aspeed/
  F:    arch/arm/boot/dts/aspeed-*
 -F:    drivers/*/*aspeed*
 +N:    aspeed
  
  ARM/ATMEL AT91 Clock Support
 -M:    Boris Brezillon <boris.brezillon@free-electrons.com>
 +M:    Boris Brezillon <boris.brezillon@bootlin.com>
  S:    Maintained
  F:    drivers/clk/at91
  
 -ARM/ATMEL AT91RM9200, AT91SAM9 AND SAMA5 SOC SUPPORT
 -M:    Nicolas Ferre <nicolas.ferre@microchip.com>
 -M:    Alexandre Belloni <alexandre.belloni@free-electrons.com>
 -L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 -W:    http://www.linux4sam.org
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91.git
 -S:    Supported
 -N:    at91
 -N:    atmel
 -F:    arch/arm/mach-at91/
 -F:    include/soc/at91/
 -F:    arch/arm/boot/dts/at91*.dts
 -F:    arch/arm/boot/dts/at91*.dtsi
 -F:    arch/arm/boot/dts/sama*.dts
 -F:    arch/arm/boot/dts/sama*.dtsi
 -F:    arch/arm/include/debug/at91.S
 -F:    drivers/memory/atmel*
 -F:    drivers/watchdog/sama5d4_wdt.c
 -X:    drivers/input/touchscreen/atmel_mxt_ts.c
 -X:    drivers/net/wireless/atmel/
 -
  ARM/CALXEDA HIGHBANK ARCHITECTURE
  M:    Rob Herring <robh@kernel.org>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
@@@ -1375,8 -1391,7 +1383,8 @@@ F:      arch/arm/mach-ebsa110
  F:    drivers/net/ethernet/amd/am79c961a.*
  
  ARM/ENERGY MICRO (SILICON LABS) EFM32 SUPPORT
 -M:    Uwe Kleine-König <kernel@pengutronix.de>
 +M:    Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
 +R:    Pengutronix Kernel Team <kernel@pengutronix.de>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Maintained
  N:    efm32
@@@ -1404,8 -1419,7 +1412,8 @@@ F:      arch/arm/mach-footbridge
  
  ARM/FREESCALE IMX / MXC ARM ARCHITECTURE
  M:    Shawn Guo <shawnguo@kernel.org>
 -M:    Sascha Hauer <kernel@pengutronix.de>
 +M:    Sascha Hauer <s.hauer@pengutronix.de>
 +R:    Pengutronix Kernel Team <kernel@pengutronix.de>
  R:    Fabio Estevam <fabio.estevam@nxp.com>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Maintained
@@@ -1420,8 -1434,7 +1428,8 @@@ F:      include/soc/imx
  
  ARM/FREESCALE VYBRID ARM ARCHITECTURE
  M:    Shawn Guo <shawnguo@kernel.org>
 -M:    Sascha Hauer <kernel@pengutronix.de>
 +M:    Sascha Hauer <s.hauer@pengutronix.de>
 +R:    Pengutronix Kernel Team <kernel@pengutronix.de>
  R:    Stefan Agner <stefan@agner.ch>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Maintained
@@@ -1572,11 -1585,20 +1580,11 @@@ ARM/MAGICIAN MACHINE SUPPOR
  M:    Philipp Zabel <philipp.zabel@gmail.com>
  S:    Maintained
  
 -ARM/Marvell Berlin SoC support
 -M:    Jisheng Zhang <jszhang@marvell.com>
 -M:    Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
 -L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 -S:    Maintained
 -F:    arch/arm/mach-berlin/
 -F:    arch/arm/boot/dts/berlin*
 -F:    arch/arm64/boot/dts/marvell/berlin*
 -
  ARM/Marvell Dove/MV78xx0/Orion SOC support
  M:    Jason Cooper <jason@lakedaemon.net>
  M:    Andrew Lunn <andrew@lunn.ch>
  M:    Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
 -M:    Gregory Clement <gregory.clement@free-electrons.com>
 +M:    Gregory Clement <gregory.clement@bootlin.com>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Maintained
  F:    Documentation/devicetree/bindings/soc/dove/
@@@ -1590,7 -1612,7 +1598,7 @@@ F:      arch/arm/boot/dts/orion5x
  ARM/Marvell Kirkwood and Armada 370, 375, 38x, 39x, XP, 3700, 7K/8K SOC support
  M:    Jason Cooper <jason@lakedaemon.net>
  M:    Andrew Lunn <andrew@lunn.ch>
 -M:    Gregory Clement <gregory.clement@free-electrons.com>
 +M:    Gregory Clement <gregory.clement@bootlin.com>
  M:    Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Maintained
@@@ -1642,27 -1664,6 +1650,27 @@@ L:    linux-arm-kernel@lists.infradead.or
  F:    arch/arm/mach-ks8695/
  S:    Odd Fixes
  
 +ARM/Microchip (AT91) SoC support
 +M:    Nicolas Ferre <nicolas.ferre@microchip.com>
 +M:    Alexandre Belloni <alexandre.belloni@bootlin.com>
 +L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 +W:    http://www.linux4sam.org
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91.git
 +S:    Supported
 +N:    at91
 +N:    atmel
 +F:    arch/arm/mach-at91/
 +F:    include/soc/at91/
 +F:    arch/arm/boot/dts/at91*.dts
 +F:    arch/arm/boot/dts/at91*.dtsi
 +F:    arch/arm/boot/dts/sama*.dts
 +F:    arch/arm/boot/dts/sama*.dtsi
 +F:    arch/arm/include/debug/at91.S
 +F:    drivers/memory/atmel*
 +F:    drivers/watchdog/sama5d4_wdt.c
 +X:    drivers/input/touchscreen/atmel_mxt_ts.c
 +X:    drivers/net/wireless/atmel/
 +
  ARM/MIOA701 MACHINE SUPPORT
  M:    Robert Jarzmik <robert.jarzmik@free.fr>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
@@@ -1707,20 -1708,6 +1715,20 @@@ F:    Documentation/devicetree/bindings/ar
  F:    Documentation/devicetree/bindings/arm/ux500/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-nomadik.git
  
 +ARM/NUVOTON NPCM ARCHITECTURE
 +M:    Avi Fishman <avifishman70@gmail.com>
 +M:    Tomer Maimon <tmaimon77@gmail.com>
 +R:    Patrick Venture <venture@google.com>
 +R:    Nancy Yuen <yuenn@google.com>
 +R:    Brendan Higgins <brendanhiggins@google.com>
 +L:    openbmc@lists.ozlabs.org (moderated for non-subscribers)
 +S:    Supported
 +F:    arch/arm/mach-npcm/
 +F:    arch/arm/boot/dts/nuvoton-npcm*
 +F:    include/dt-bindings/clock/nuvoton,npcm7xx-clks.h
 +F:    drivers/*/*npcm*
 +F:    Documentation/*/*npcm*
 +
  ARM/NUVOTON W90X900 ARM ARCHITECTURE
  M:    Wan ZongShun <mcuos.com@gmail.com>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
@@@ -1731,7 -1718,7 +1739,7 @@@ F:      drivers/input/keyboard/w90p910_keypa
  F:    drivers/input/touchscreen/w90p910_ts.c
  F:    drivers/watchdog/nuc900_wdt.c
  F:    drivers/net/ethernet/nuvoton/w90p910_ether.c
 -F:    drivers/mtd/nand/nuc900_nand.c
 +F:    drivers/mtd/nand/raw/nuc900_nand.c
  F:    drivers/rtc/rtc-nuc900.c
  F:    drivers/spi/spi-nuc900.c
  F:    drivers/usb/host/ehci-w90x900.c
@@@ -1753,7 -1740,7 +1761,7 @@@ F:      arch/arm/mach-orion5x/ts78xx-
  ARM/OXNAS platform support
  M:    Neil Armstrong <narmstrong@baylibre.com>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 -L:    linux-oxnas@lists.tuxfamily.org (moderated for non-subscribers)
 +L:    linux-oxnas@groups.io (moderated for non-subscribers)
  S:    Maintained
  F:    arch/arm/mach-oxnas/
  F:    arch/arm/boot/dts/ox8*.dts*
@@@ -1884,6 -1871,7 +1892,6 @@@ Q:      https://patchwork.kernel.org/project
  S:    Maintained
  F:    arch/arm/boot/dts/s3c*
  F:    arch/arm/boot/dts/s5p*
 -F:    arch/arm/boot/dts/samsung*
  F:    arch/arm/boot/dts/exynos*
  F:    arch/arm64/boot/dts/exynos/
  F:    arch/arm/plat-samsung/
@@@ -1983,14 -1971,6 +1991,14 @@@ M:    Thor Thayer <thor.thayer@linux.intel
  S:    Maintained
  F:    drivers/edac/altera_edac.
  
 +ARM/SPREADTRUM SoC SUPPORT
 +M:    Orson Zhai <orsonzhai@gmail.com>
 +M:    Baolin Wang <baolin.wang@linaro.org>
 +M:    Chunyan Zhang <zhang.lyra@gmail.com>
 +S:    Maintained
 +F:    arch/arm64/boot/dts/sprd
 +N:    sprd
 +
  ARM/STI ARCHITECTURE
  M:    Patrice Chotard <patrice.chotard@st.com>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
@@@ -2027,21 -2007,10 +2035,21 @@@ M:   Maxime Coquelin <mcoquelin.stm32@gma
  M:    Alexandre Torgue <alexandre.torgue@st.com>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Maintained
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mcoquelin/stm32.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/atorgue/stm32.git stm32-next
  N:    stm32
 +F:    arch/arm/boot/dts/stm32*
 +F:    arch/arm/mach-stm32/
  F:    drivers/clocksource/armv7m_systick.c
  
 +ARM/Synaptics Berlin SoC support
 +M:    Jisheng Zhang <Jisheng.Zhang@synaptics.com>
 +M:    Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
 +L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 +S:    Maintained
 +F:    arch/arm/mach-berlin/
 +F:    arch/arm/boot/dts/berlin*
 +F:    arch/arm64/boot/dts/marvell/berlin*
 +
  ARM/TANGO ARCHITECTURE
  M:    Marc Gonzalez <marc.w.gonzalez@free.fr>
  M:    Mans Rullgard <mans@mansr.com>
@@@ -2431,6 -2400,7 +2439,6 @@@ T:      git git://github.com/ndyer/linux.gi
  S:    Maintained
  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 SAMA5D2 ADC DRIVER
  M:    Ludovic Desroches <ludovic.desroches@microchip.com>
@@@ -2513,6 -2483,7 +2521,6 @@@ M:      Paul Moore <paul@paul-moore.com
  M:    Eric Paris <eparis@redhat.com>
  L:    linux-audit@redhat.com (moderated for non-subscribers)
  W:    https://github.com/linux-audit
 -W:    https://people.redhat.com/sgrubb/audit
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/audit.git
  S:    Supported
  F:    include/linux/audit.h
@@@ -2619,7 -2590,7 +2627,7 @@@ S:      Maintaine
  F:    drivers/net/hamradio/baycom*
  
  BCACHE (BLOCK LAYER CACHE)
 -M:    Michael Lyle <mlyle@lyle.org>
 +M:    Coly Li <colyli@suse.de>
  M:    Kent Overstreet <kent.overstreet@gmail.com>
  L:    linux-bcache@vger.kernel.org
  W:    http://bcache.evilpiepirate.org
@@@ -2664,6 -2635,51 +2672,6 @@@ F:     Documentation/filesystems/bfs.tx
  F:    fs/bfs/
  F:    include/uapi/linux/bfs_fs.h
  
 -BLACKFIN ARCHITECTURE
 -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:    Orphan
 -F:    arch/blackfin/
 -
 -BLACKFIN EMAC DRIVER
 -L:    adi-buildroot-devel@lists.sourceforge.net (moderated for non-subscribers)
 -W:    http://blackfin.uclinux.org
 -S:    Orphan
 -F:    drivers/net/ethernet/adi/
 -
 -BLACKFIN MEDIA DRIVER
 -L:    adi-buildroot-devel@lists.sourceforge.net (moderated for non-subscribers)
 -W:    http://blackfin.uclinux.org/
 -S:    Orphan
 -F:    drivers/media/platform/blackfin/
 -F:    drivers/media/i2c/adv7183*
 -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:    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:    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:    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:    Orphan
 -F:    drivers/watchdog/bfin_wdt.c
 -
  BLINKM RGB LED DRIVER
  M:    Jan-Simon Moeller <jansimon.moeller@gmx.de>
  S:    Maintained
@@@ -2675,7 -2691,6 +2683,7 @@@ L:      linux-block@vger.kernel.or
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/axboe/linux-block.git
  S:    Maintained
  F:    block/
 +F:    drivers/block/
  F:    kernel/trace/blktrace.c
  F:    lib/sbitmap.c
  
@@@ -3007,7 -3022,7 +3015,7 @@@ M:      Kamal Dasu <kdasu.kdev@gmail.com
  L:    linux-mtd@lists.infradead.org
  L:    bcm-kernel-feedback-list@broadcom.com
  S:    Maintained
 -F:    drivers/mtd/nand/brcmnand/
 +F:    drivers/mtd/nand/raw/brcmnand/
  
  BROADCOM STB DPFE DRIVER
  M:    Markus Mayer <mmayer@broadcom.com>
@@@ -3275,11 -3290,12 +3283,11 @@@ F:   drivers/net/ieee802154/cc2520.
  F:    include/linux/spi/cc2520.h
  F:    Documentation/devicetree/bindings/net/ieee802154/cc2520.txt
  
 -CCREE ARM TRUSTZONE CRYPTOCELL 700 REE DRIVER
 +CCREE ARM TRUSTZONE CRYPTOCELL REE DRIVER
  M:    Gilad Ben-Yossef <gilad@benyossef.com>
  L:    linux-crypto@vger.kernel.org
 -L:    driverdev-devel@linuxdriverproject.org
  S:    Supported
 -F:    drivers/staging/ccree/
 +F:    drivers/crypto/ccree/
  W:    https://developer.arm.com/products/system-ip/trustzone-cryptocell/cryptocell-700-family
  
  CEC FRAMEWORK
@@@ -3297,7 -3313,6 +3305,7 @@@ F:      include/media/cec-notifier.
  F:    include/uapi/linux/cec.h
  F:    include/uapi/linux/cec-funcs.h
  F:    Documentation/devicetree/bindings/media/cec.txt
 +F:    Documentation/ABI/testing/debugfs-cec-error-inj
  
  CEC GPIO DRIVER
  M:    Hans Verkuil <hans.verkuil@cisco.com>
@@@ -3740,6 -3755,16 +3748,6 @@@ S:     Maintaine
  F:    Documentation/filesystems/cramfs.txt
  F:    fs/cramfs/
  
 -CRIS PORT
 -M:    Mikael Starvik <starvik@axis.com>
 -M:    Jesper Nilsson <jesper.nilsson@axis.com>
 -L:    linux-cris-kernel@axis.com
 -W:    http://developer.axis.com
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jesper/cris.git
 -S:    Maintained
 -F:    arch/cris/
 -F:    drivers/tty/serial/crisv10.*
 -
  CRYPTO API
  M:    Herbert Xu <herbert@gondor.apana.org.au>
  M:    "David S. Miller" <davem@davemloft.net>
@@@ -4099,10 -4124,10 +4107,10 @@@ DENALI NAND DRIVE
  M:    Masahiro Yamada <yamada.masahiro@socionext.com>
  L:    linux-mtd@lists.infradead.org
  S:    Supported
 -F:    drivers/mtd/nand/denali*
 +F:    drivers/mtd/nand/raw/denali*
  
  DESIGNWARE USB2 DRD IP DRIVER
 -M:    John Youn <johnyoun@synopsys.com>
 +M:    Minas Harutyunyan <hminas@synopsys.com>
  L:    linux-usb@vger.kernel.org
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git
  S:    Maintained
@@@ -4250,9 -4275,6 +4258,9 @@@ F:      include/trace/events/fs_dax.
  
  DEVICE DIRECT ACCESS (DAX)
  M:    Dan Williams <dan.j.williams@intel.com>
 +M:    Dave Jiang <dave.jiang@intel.com>
 +M:    Ross Zwisler <ross.zwisler@linux.intel.com>
 +M:    Vishal Verma <vishal.l.verma@intel.com>
  L:    linux-nvdimm@lists.01.org
  S:    Supported
  F:    drivers/dax/
@@@ -4319,7 -4341,6 +4327,7 @@@ Q:      https://patchwork.kernel.org/project
  S:    Maintained
  F:    drivers/dma/
  F:    include/linux/dmaengine.h
 +F:    include/linux/of_dma.h
  F:    Documentation/devicetree/bindings/dma/
  F:    Documentation/driver-api/dmaengine/
  T:    git git://git.infradead.org/users/vkoul/slave-dma.git
@@@ -4403,14 -4424,8 +4411,14 @@@ L:    linux-kernel@vger.kernel.or
  S:    Maintained
  F:    drivers/staging/fsl-dpaa2/ethsw
  
 +DPAA2 PTP CLOCK DRIVER
 +M:    Yangbo Lu <yangbo.lu@nxp.com>
 +L:    linux-kernel@vger.kernel.org
 +S:    Maintained
 +F:    drivers/staging/fsl-dpaa2/rtc
 +
  DPT_I2O SCSI RAID DRIVER
 -M:    Adaptec OEM Raid Solutions <aacraid@adaptec.com>
 +M:    Adaptec OEM Raid Solutions <aacraid@microsemi.com>
  L:    linux-scsi@vger.kernel.org
  W:    http://www.adaptec.com/
  S:    Maintained
@@@ -4455,13 -4470,6 +4463,13 @@@ T:    git git://anongit.freedesktop.org/dr
  S:    Supported
  F:    drivers/gpu/drm/pl111/
  
 +DRM DRIVER FOR ARM VERSATILE TFT PANELS
 +M:    Linus Walleij <linus.walleij@linaro.org>
 +T:    git git://anongit.freedesktop.org/drm/drm-misc
 +S:    Maintained
 +F:    drivers/gpu/drm/panel/panel-arm-versatile.c
 +F:    Documentation/devicetree/bindings/display/panel/arm,versatile-tft-panel.txt
 +
  DRM DRIVER FOR AST SERVER GRAPHICS CHIPS
  M:    Dave Airlie <airlied@redhat.com>
  S:    Odd Fixes
@@@ -4616,8 -4624,8 +4624,8 @@@ F:      include/uapi/drm
  F:    include/linux/vga*
  
  DRM DRIVERS AND MISC GPU PATCHES
 -M:    Daniel Vetter <daniel.vetter@intel.com>
  M:    Gustavo Padovan <gustavo@padovan.org>
 +M:    Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
  M:    Sean Paul <seanpaul@chromium.org>
  W:    https://01.org/linuxgraphics/gfx-docs/maintainer-tools/drm-misc.html
  S:    Maintained
@@@ -4630,7 -4638,7 +4638,7 @@@ F:      include/uapi/drm/drm
  F:    include/linux/vga*
  
  DRM DRIVERS FOR ALLWINNER A10
 -M:    Maxime Ripard  <maxime.ripard@free-electrons.com>
 +M:    Maxime Ripard  <maxime.ripard@bootlin.com>
  L:    dri-devel@lists.freedesktop.org
  S:    Supported
  F:    drivers/gpu/drm/sun4i/
@@@ -4650,7 -4658,7 +4658,7 @@@ F:      Documentation/gpu/meson.rs
  T:    git git://anongit.freedesktop.org/drm/drm-misc
  
  DRM DRIVERS FOR ATMEL HLCDC
 -M:    Boris Brezillon <boris.brezillon@free-electrons.com>
 +M:    Boris Brezillon <boris.brezillon@bootlin.com>
  L:    dri-devel@lists.freedesktop.org
  S:    Supported
  F:    drivers/gpu/drm/atmel-hlcdc/
@@@ -4743,7 -4751,6 +4751,7 @@@ F:      drivers/gpu/drm/rcar-du
  F:    drivers/gpu/drm/shmobile/
  F:    include/linux/platform_data/shmob_drm.h
  F:    Documentation/devicetree/bindings/display/bridge/renesas,dw-hdmi.txt
 +F:    Documentation/devicetree/bindings/display/bridge/renesas,lvds.txt
  F:    Documentation/devicetree/bindings/display/renesas,du.txt
  
  DRM DRIVERS FOR ROCKCHIP
@@@ -5010,6 -5017,12 +5018,6 @@@ T:     git git://linuxtv.org/anttip/media_t
  S:    Maintained
  F:    drivers/media/tuners/e4000*
  
 -EATA ISA/EISA/PCI SCSI DRIVER
 -M:    Dario Ballabio <ballabio_dario@emc.com>
 -L:    linux-scsi@vger.kernel.org
 -S:    Maintained
 -F:    drivers/scsi/eata.c
 -
  EC100 MEDIA DRIVER
  M:    Antti Palosaari <crope@iki.fi>
  L:    linux-media@vger.kernel.org
@@@ -5551,7 -5564,7 +5559,7 @@@ M:      Luis R. Rodriguez <mcgrof@kernel.org
  L:    linux-kernel@vger.kernel.org
  S:    Maintained
  F:    Documentation/firmware_class/
 -F:    drivers/base/firmware*.c
 +F:    drivers/base/firmware_loader/
  F:    include/linux/firmware.h
  
  FLASH ADAPTER DRIVER (IBM Flash Adapter 900GB Full Height PCI Flash Card)
@@@ -5636,7 -5649,7 +5644,7 @@@ S:      Maintaine
  F:    drivers/dma/fsldma.*
  
  FREESCALE eTSEC ETHERNET DRIVER (GIANFAR)
 -M:    Claudiu Manoil <claudiu.manoil@freescale.com>
 +M:    Claudiu Manoil <claudiu.manoil@nxp.com>
  L:    netdev@vger.kernel.org
  S:    Maintained
  F:    drivers/net/ethernet/freescale/gianfar*
@@@ -5647,7 -5660,7 +5655,7 @@@ FREESCALE GPMI NAND DRIVE
  M:    Han Xu <han.xu@nxp.com>
  L:    linux-mtd@lists.infradead.org
  S:    Maintained
 -F:    drivers/mtd/nand/gpmi-nand/*
 +F:    drivers/mtd/nand/raw/gpmi-nand/*
  
  FREESCALE I2C CPM DRIVER
  M:    Jochen Friedrich <jochen@scram.de>
@@@ -5666,8 -5679,7 +5674,8 @@@ F:      drivers/net/ethernet/freescale/fec.
  F:    Documentation/devicetree/bindings/net/fsl-fec.txt
  
  FREESCALE IMX / MXC FRAMEBUFFER DRIVER
 -M:    Sascha Hauer <kernel@pengutronix.de>
 +M:    Sascha Hauer <s.hauer@pengutronix.de>
 +R:    Pengutronix Kernel Team <kernel@pengutronix.de>
  L:    linux-fbdev@vger.kernel.org
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Maintained
@@@ -5799,13 -5811,9 +5807,13 @@@ F:    fs/crypto
  F:    include/linux/fscrypt*.h
  F:    Documentation/filesystems/fscrypt.rst
  
 -FUJITSU FR-V (FRV) PORT
 -S:    Orphan
 -F:    arch/frv/
 +FSNOTIFY: FILESYSTEM NOTIFICATION INFRASTRUCTURE
 +M:    Jan Kara <jack@suse.cz>
 +R:    Amir Goldstein <amir73il@gmail.com>
 +L:    linux-fsdevel@vger.kernel.org
 +S:    Maintained
 +F:    fs/notify/
 +F:    include/linux/fsnotify*.h
  
  FUJITSU LAPTOP EXTRAS
  M:    Jonathan Woithe <jwoithe@just42.net>
@@@ -5854,6 -5862,12 +5862,6 @@@ F:     tools/testing/selftests/futex
  F:    tools/perf/bench/futex*
  F:    Documentation/*futex*
  
 -FUTURE DOMAIN TMC-16x0 SCSI DRIVER (16-bit)
 -M:    Rik Faith <faith@cs.unc.edu>
 -L:    linux-scsi@vger.kernel.org
 -S:    Odd Fixes (e.g., new signatures)
 -F:    drivers/scsi/fdomain.*
 -
  GCC PLUGINS
  M:    Kees Cook <keescook@chromium.org>
  R:    Emese Revfy <re.emese@gmail.com>
@@@ -5865,7 -5879,7 +5873,7 @@@ F:      scripts/Makefile.gcc-plugin
  F:    Documentation/gcc-plugins.txt
  
  GCOV BASED KERNEL PROFILING
 -M:    Peter Oberparleiter <oberpar@linux.vnet.ibm.com>
 +M:    Peter Oberparleiter <oberpar@linux.ibm.com>
  S:    Maintained
  F:    kernel/gcov/
  F:    Documentation/dev-tools/gcov.rst
@@@ -5933,11 -5947,6 +5941,11 @@@ S:    Supporte
  F:    drivers/phy/
  F:    include/linux/phy/
  
 +GENERIC PINCTRL I2C DEMULTIPLEXER DRIVER
 +M:    Wolfram Sang <wsa+renesas@sang-engineering.com>
 +S:    Supported
 +F:    drivers/i2c/muxes/i2c-demux-pinctrl.c
 +
  GENERIC PM DOMAINS
  M:    "Rafael J. Wysocki" <rjw@rjwysocki.net>
  M:    Kevin Hilman <khilman@kernel.org>
@@@ -6019,7 -6028,7 +6027,7 @@@ S:      Maintaine
  F:    drivers/media/rc/gpio-ir-tx.c
  
  GPIO MOCKUP DRIVER
 -M:    Bamvor Jian Zhang <bamvor.zhangjian@linaro.org>
 +M:    Bamvor Jian Zhang <bamv2005@gmail.com>
  R:    Bartosz Golaszewski <brgl@bgdev.pl>
  L:    linux-gpio@vger.kernel.org
  S:    Maintained
@@@ -6032,14 -6041,12 +6040,14 @@@ L:   linux-gpio@vger.kernel.or
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio.git
  S:    Maintained
  F:    Documentation/devicetree/bindings/gpio/
 +F:    Documentation/driver-api/gpio/
  F:    Documentation/gpio/
  F:    Documentation/ABI/testing/gpio-cdev
  F:    Documentation/ABI/obsolete/sysfs-gpio
  F:    drivers/gpio/
  F:    include/linux/gpio/
  F:    include/linux/gpio.h
 +F:    include/linux/of_gpio.h
  F:    include/asm-generic/gpio.h
  F:    include/uapi/linux/gpio.h
  F:    tools/gpio/
@@@ -6249,11 -6256,6 +6257,11 @@@ F:    Documentation/hw_random.tx
  F:    drivers/char/hw_random/
  F:    include/linux/hw_random.h
  
 +HARDWARE TRACING FACILITIES
 +M:    Alexander Shishkin <alexander.shishkin@linux.intel.com>
 +S:    Maintained
 +F:    drivers/hwtracing/
 +
  HARDWARE SPINLOCK CORE
  M:    Ohad Ben-Cohen <ohad@wizery.com>
  M:    Bjorn Andersson <bjorn.andersson@linaro.org>
@@@ -6279,7 -6281,7 +6287,7 @@@ S:      Odd Fixe
  F:    drivers/media/usb/hdpvr/
  
  HEWLETT PACKARD ENTERPRISE ILO NMI WATCHDOG DRIVER
 -M:    Jimmy Vance <jimmy.vance@hpe.com>
 +M:    Jerry Hoemann <jerry.hoemann@hpe.com>
  S:    Supported
  F:    Documentation/watchdog/hpwdt.txt
  F:    drivers/watchdog/hpwdt.c
@@@ -6398,13 -6400,6 +6406,13 @@@ W:    http://www.hisilicon.co
  S:    Maintained
  F:    drivers/net/ethernet/hisilicon/hns3/
  
 +HISILICON LPC BUS DRIVER
 +M:    john.garry@huawei.com
 +W:    http://www.hisilicon.com
 +S:    Maintained
 +F:    drivers/bus/hisi_lpc.c
 +F:    Documentation/devicetree/bindings/arm/hisilicon/hisilicon-low-pin-count.txt
 +
  HISILICON NETWORK SUBSYSTEM DRIVER
  M:    Yisen Zhuang <yisen.zhuang@huawei.com>
  M:    Salil Mehta <salil.mehta@huawei.com>
@@@ -6442,7 -6437,6 +6450,7 @@@ L:      linux-mm@kvack.or
  S:    Maintained
  F:    mm/hmm*
  F:    include/linux/hmm*
 +F:    Documentation/vm/hmm.txt
  
  HOST AP DRIVER
  M:    Jouni Malinen <j@w1.fi>
@@@ -6549,7 -6543,7 +6557,7 @@@ S:      Maintaine
  F:    Documentation/networking/netvsc.txt
  F:    arch/x86/include/asm/mshyperv.h
  F:    arch/x86/include/asm/trace/hyperv.h
 -F:    arch/x86/include/uapi/asm/hyperv.h
 +F:    arch/x86/include/asm/hyperv-tlfs.h
  F:    arch/x86/kernel/cpu/mshyperv.c
  F:    arch/x86/hyperv
  F:    drivers/hid/hid-hyperv.c
@@@ -6592,7 -6586,7 +6600,7 @@@ F:      drivers/i2c/muxes
  F:    include/linux/i2c-mux.h
  
  I2C MV64XXX MARVELL AND ALLWINNER DRIVER
 -M:    Gregory CLEMENT <gregory.clement@free-electrons.com>
 +M:    Gregory CLEMENT <gregory.clement@bootlin.com>
  L:    linux-i2c@vger.kernel.org
  S:    Maintained
  F:    drivers/i2c/busses/i2c-mv64xxx.c
@@@ -6613,25 -6607,15 +6621,25 @@@ W:   https://i2c.wiki.kernel.org
  Q:    https://patchwork.ozlabs.org/project/linux-i2c/list/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux.git
  S:    Maintained
 -F:    Documentation/devicetree/bindings/i2c/
 +F:    Documentation/devicetree/bindings/i2c/i2c.txt
  F:    Documentation/i2c/
 -F:    drivers/i2c/
 -F:    drivers/i2c/*/
 +F:    drivers/i2c/*
  F:    include/linux/i2c.h
 -F:    include/linux/i2c-*.h
 +F:    include/linux/i2c-dev.h
 +F:    include/linux/i2c-smbus.h
  F:    include/uapi/linux/i2c.h
  F:    include/uapi/linux/i2c-*.h
  
 +I2C SUBSYSTEM HOST DRIVERS
 +L:    linux-i2c@vger.kernel.org
 +W:    https://i2c.wiki.kernel.org/
 +Q:    https://patchwork.ozlabs.org/project/linux-i2c/list/
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux.git
 +S:    Odd Fixes
 +F:    Documentation/devicetree/bindings/i2c/
 +F:    drivers/i2c/algos/
 +F:    drivers/i2c/busses/
 +
  I2C-TAOS-EVM DRIVER
  M:    Jean Delvare <jdelvare@suse.com>
  L:    linux-i2c@vger.kernel.org
@@@ -6914,6 -6898,15 +6922,15 @@@ F:    drivers/staging/iio
  F:    include/linux/iio/
  F:    tools/iio/
  
+ IIO UNIT CONVERTER
+ M:    Peter Rosin <peda@axentia.se>
+ L:    linux-iio@vger.kernel.org
+ S:    Maintained
+ F:    Documentation/devicetree/bindings/iio/afe/current-sense-amplifier.txt
+ F:    Documentation/devicetree/bindings/iio/afe/current-sense-shunt.txt
+ F:    Documentation/devicetree/bindings/iio/afe/voltage-divider.txt
+ F:    drivers/iio/afe/iio-rescale.c
+ 
  IKANOS/ADI EAGLE ADSL USB DRIVER
  M:    Matthieu Castet <castet.matthieu@free.fr>
  M:    Stanislaw Gruszka <stf_xl@wp.pl>
@@@ -6931,13 -6924,6 +6948,13 @@@ M:    James Hogan <jhogan@kernel.org
  S:    Maintained
  F:    drivers/media/rc/img-ir/
  
 +IMON SOUNDGRAPH USB IR RECEIVER
 +M:    Sean Young <sean@mess.org>
 +L:    linux-media@vger.kernel.org
 +S:    Maintained
 +F:    drivers/media/rc/imon_raw.c
 +F:    drivers/media/rc/imon.c
 +
  IMS TWINTURBO FRAMEBUFFER DRIVER
  L:    linux-fbdev@vger.kernel.org
  S:    Orphan
@@@ -6992,7 -6978,7 +7009,7 @@@ INGENIC JZ4780 NAND DRIVE
  M:    Harvey Hunt <harveyhuntnexus@gmail.com>
  L:    linux-mtd@lists.infradead.org
  S:    Maintained
 -F:    drivers/mtd/nand/jz4780_*
 +F:    drivers/mtd/nand/raw/jz4780_*
  
  INOTIFY
  M:    Jan Kara <jack@suse.cz>
@@@ -7027,7 -7013,7 +7044,7 @@@ F:      drivers/input/input-mt.
  K:    \b(ABS|SYN)_MT_
  
  INSIDE SECURE CRYPTO DRIVER
 -M:    Antoine Tenart <antoine.tenart@free-electrons.com>
 +M:    Antoine Tenart <antoine.tenart@bootlin.com>
  F:    drivers/crypto/inside-secure/
  S:    Maintained
  L:    linux-crypto@vger.kernel.org
@@@ -7098,7 -7084,6 +7115,7 @@@ F:      Documentation/networking/ixgbe.tx
  F:    Documentation/networking/ixgbevf.txt
  F:    Documentation/networking/i40e.txt
  F:    Documentation/networking/i40evf.txt
 +F:    Documentation/networking/ice.txt
  F:    drivers/net/ethernet/intel/
  F:    drivers/net/ethernet/intel/*/
  F:    include/linux/avf/virtchnl.h
@@@ -7264,15 -7249,6 +7281,15 @@@ M:    Shiraz Saleem <shiraz.saleem@intel.c
  L:    linux-rdma@vger.kernel.org
  S:    Supported
  F:    drivers/infiniband/hw/i40iw/
 +F:    include/uapi/rdma/i40iw-abi.h
 +
 +INTEL SHA MULTIBUFFER DRIVER
 +M:    Megha Dey <megha.dey@linux.intel.com>
 +R:    Tim Chen <tim.c.chen@linux.intel.com>
 +L:    linux-crypto@vger.kernel.org
 +S:    Supported
 +F:    arch/x86/crypto/sha*-mb
 +F:    crypto/mcryptd.c
  
  INTEL TELEMETRY DRIVER
  M:    Souvik Kumar Chakravarty <souvik.k.chakravarty@intel.com>
@@@ -7368,7 -7344,6 +7385,7 @@@ S:      Maintaine
  F:    Documentation/devicetree/bindings/iommu/
  F:    drivers/iommu/
  F:    include/linux/iommu.h
 +F:    include/linux/of_iommu.h
  F:    include/linux/iova.h
  
  IP MASQUERADING
@@@ -7387,7 -7362,7 +7404,7 @@@ F:      include/linux/ipmi
  F:    include/uapi/linux/ipmi*
  
  IPS SCSI RAID DRIVER
 -M:    Adaptec OEM Raid Solutions <aacraid@adaptec.com>
 +M:    Adaptec OEM Raid Solutions <aacraid@microsemi.com>
  L:    linux-scsi@vger.kernel.org
  W:    http://www.adaptec.com/
  S:    Maintained
@@@ -7419,6 -7394,16 +7436,6 @@@ S:     Obsolet
  F:    include/uapi/linux/ipx.h
  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:    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/
 -
  IRQ DOMAINS (IRQ NUMBER MAPPING LIBRARY)
  M:    Marc Zyngier <marc.zyngier@arm.com>
  S:    Maintained
@@@ -7559,13 -7544,6 +7576,13 @@@ Q:    http://patchwork.linuxtv.org/project
  S:    Maintained
  F:    drivers/media/dvb-frontends/ix2505v*
  
 +JAILHOUSE HYPERVISOR INTERFACE
 +M:    Jan Kiszka <jan.kiszka@siemens.com>
 +L:    jailhouse-dev@googlegroups.com
 +S:    Maintained
 +F:    arch/x86/kernel/jailhouse.c
 +F:    arch/x86/include/asm/jailhouse_para.h
 +
  JC42.4 TEMPERATURE SENSOR DRIVER
  M:    Guenter Roeck <linux@roeck-us.net>
  L:    linux-hwmon@vger.kernel.org
@@@ -7645,10 -7623,8 +7662,10 @@@ F:    mm/kasan
  F:    scripts/Makefile.kasan
  
  KCONFIG
 +M:    Masahiro Yamada <yamada.masahiro@socionext.com>
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git kconfig
  L:    linux-kbuild@vger.kernel.org
 -S:    Orphan
 +S:    Maintained
  F:    Documentation/kbuild/kconfig-language.txt
  F:    scripts/kconfig/
  
@@@ -7751,7 -7727,7 +7768,7 @@@ F:      arch/x86/include/asm/svm.
  F:    arch/x86/kvm/svm.c
  
  KERNEL VIRTUAL MACHINE FOR ARM (KVM/arm)
 -M:    Christoffer Dall <christoffer.dall@linaro.org>
 +M:    Christoffer Dall <christoffer.dall@arm.com>
  M:    Marc Zyngier <marc.zyngier@arm.com>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  L:    kvmarm@lists.cs.columbia.edu
@@@ -7765,7 -7741,7 +7782,7 @@@ F:      virt/kvm/arm
  F:    include/kvm/arm_*
  
  KERNEL VIRTUAL MACHINE FOR ARM64 (KVM/arm64)
 -M:    Christoffer Dall <christoffer.dall@linaro.org>
 +M:    Christoffer Dall <christoffer.dall@arm.com>
  M:    Marc Zyngier <marc.zyngier@arm.com>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  L:    kvmarm@lists.cs.columbia.edu
@@@ -7795,7 -7771,7 +7812,7 @@@ F:      arch/powerpc/kernel/kvm
  
  KERNEL VIRTUAL MACHINE for s390 (KVM/s390)
  M:    Christian Borntraeger <borntraeger@de.ibm.com>
 -M:    Janosch Frank <frankja@linux.vnet.ibm.com>
 +M:    Janosch Frank <frankja@linux.ibm.com>
  R:    David Hildenbrand <david@redhat.com>
  R:    Cornelia Huck <cohuck@redhat.com>
  L:    linux-s390@vger.kernel.org
@@@ -7952,10 -7928,7 +7969,10 @@@ F:    drivers/scsi/53c700
  
  LEAKING_ADDRESSES
  M:    Tobin C. Harding <me@tobin.cc>
 +M:    Tycho Andersen <tycho@tycho.ws>
 +L:    kernel-hardening@lists.openwall.com
  S:    Maintained
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tobin/leaks.git
  F:    scripts/leaking_addresses.pl
  
  LED SUBSYSTEM
@@@ -8061,9 -8034,6 +8078,9 @@@ F:      tools/lib/lockdep
  
  LIBNVDIMM BLK: MMIO-APERTURE DRIVER
  M:    Ross Zwisler <ross.zwisler@linux.intel.com>
 +M:    Dan Williams <dan.j.williams@intel.com>
 +M:    Vishal Verma <vishal.l.verma@intel.com>
 +M:    Dave Jiang <dave.jiang@intel.com>
  L:    linux-nvdimm@lists.01.org
  Q:    https://patchwork.kernel.org/project/linux-nvdimm/list/
  S:    Supported
@@@ -8072,9 -8042,6 +8089,9 @@@ F:      drivers/nvdimm/region_devs.
  
  LIBNVDIMM BTT: BLOCK TRANSLATION TABLE
  M:    Vishal Verma <vishal.l.verma@intel.com>
 +M:    Dan Williams <dan.j.williams@intel.com>
 +M:    Ross Zwisler <ross.zwisler@linux.intel.com>
 +M:    Dave Jiang <dave.jiang@intel.com>
  L:    linux-nvdimm@lists.01.org
  Q:    https://patchwork.kernel.org/project/linux-nvdimm/list/
  S:    Supported
@@@ -8082,27 -8049,13 +8099,27 @@@ F:   drivers/nvdimm/btt
  
  LIBNVDIMM PMEM: PERSISTENT MEMORY DRIVER
  M:    Ross Zwisler <ross.zwisler@linux.intel.com>
 +M:    Dan Williams <dan.j.williams@intel.com>
 +M:    Vishal Verma <vishal.l.verma@intel.com>
 +M:    Dave Jiang <dave.jiang@intel.com>
  L:    linux-nvdimm@lists.01.org
  Q:    https://patchwork.kernel.org/project/linux-nvdimm/list/
  S:    Supported
  F:    drivers/nvdimm/pmem*
  
 +LIBNVDIMM: DEVICETREE BINDINGS
 +M:    Oliver O'Halloran <oohall@gmail.com>
 +L:    linux-nvdimm@lists.01.org
 +Q:    https://patchwork.kernel.org/project/linux-nvdimm/list/
 +S:    Supported
 +F:    drivers/nvdimm/of_pmem.c
 +F:    Documentation/devicetree/bindings/pmem/pmem-region.txt
 +
  LIBNVDIMM: NON-VOLATILE MEMORY DEVICE SUBSYSTEM
  M:    Dan Williams <dan.j.williams@intel.com>
 +M:    Ross Zwisler <ross.zwisler@linux.intel.com>
 +M:    Vishal Verma <vishal.l.verma@intel.com>
 +M:    Dave Jiang <dave.jiang@intel.com>
  L:    linux-nvdimm@lists.01.org
  Q:    https://patchwork.kernel.org/project/linux-nvdimm/list/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm.git
@@@ -8215,25 -8168,7 +8232,25 @@@ F:    drivers/*/*/*pasemi
  LINUX KERNEL DUMP TEST MODULE (LKDTM)
  M:    Kees Cook <keescook@chromium.org>
  S:    Maintained
 -F:    drivers/misc/lkdtm*
 +F:    drivers/misc/lkdtm/*
 +
 +LINUX KERNEL MEMORY CONSISTENCY MODEL (LKMM)
 +M:    Alan Stern <stern@rowland.harvard.edu>
 +M:    Andrea Parri <parri.andrea@gmail.com>
 +M:    Will Deacon <will.deacon@arm.com>
 +M:    Peter Zijlstra <peterz@infradead.org>
 +M:    Boqun Feng <boqun.feng@gmail.com>
 +M:    Nicholas Piggin <npiggin@gmail.com>
 +M:    David Howells <dhowells@redhat.com>
 +M:    Jade Alglave <j.alglave@ucl.ac.uk>
 +M:    Luc Maranget <luc.maranget@inria.fr>
 +M:    "Paul E. McKenney" <paulmck@linux.vnet.ibm.com>
 +R:    Akira Yokosawa <akiyks@gmail.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:    tools/memory-model/
 +F:    Documentation/memory-barriers.txt
  
  LINUX SECURITY MODULE (LSM) FRAMEWORK
  M:    Chris Wright <chrisw@sous-sol.org>
@@@ -8396,6 -8331,11 +8413,6 @@@ W:     http://linux-test-project.github.io
  T:    git git://github.com/linux-test-project/ltp.git
  S:    Maintained
  
 -M32R ARCHITECTURE
 -W:    http://www.linux-m32r.org/
 -S:    Orphan
 -F:    arch/m32r/
 -
  M68K ARCHITECTURE
  M:    Geert Uytterhoeven <geert@linux-m68k.org>
  L:    linux-m68k@lists.linux-m68k.org
@@@ -8494,7 -8434,7 +8511,7 @@@ F:      include/uapi/drm/armada_drm.
  F:    Documentation/devicetree/bindings/display/armada/
  
  MARVELL CRYPTO DRIVER
 -M:    Boris Brezillon <boris.brezillon@free-electrons.com>
 +M:    Boris Brezillon <boris.brezillon@bootlin.com>
  M:    Arnaud Ebalard <arno@natisbad.org>
  F:    drivers/crypto/marvell/
  S:    Maintained
@@@ -8513,7 -8453,7 +8530,7 @@@ S:      Orpha
  F:    drivers/net/wireless/marvell/libertas/
  
  MARVELL MACCHIATOBIN SUPPORT
 -M:    Russell King <rmk@armlinux.org.uk>
 +M:    Russell King <linux@armlinux.org.uk>
  L:    linux-arm-kernel@lists.infradead.org
  S:    Maintained
  F:    arch/arm64/boot/dts/marvell/armada-8040-mcbin.dts
@@@ -8526,7 -8466,7 +8543,7 @@@ F:      drivers/net/ethernet/marvell/mv643xx
  F:    include/linux/mv643xx.h
  
  MARVELL MV88X3310 PHY DRIVER
 -M:    Russell King <rmk@armlinux.org.uk>
 +M:    Russell King <linux@armlinux.org.uk>
  L:    netdev@vger.kernel.org
  S:    Maintained
  F:    drivers/net/phy/marvell10g.c
@@@ -8553,10 -8493,10 +8570,10 @@@ S:   Odd Fixe
  F:    drivers/net/wireless/marvell/mwl8k.c
  
  MARVELL NAND CONTROLLER DRIVER
 -M:    Miquel Raynal <miquel.raynal@free-electrons.com>
 +M:    Miquel Raynal <miquel.raynal@bootlin.com>
  L:    linux-mtd@lists.infradead.org
  S:    Maintained
 -F:    drivers/mtd/nand/marvell_nand.c
 +F:    drivers/mtd/nand/raw/marvell_nand.c
  F:    Documentation/devicetree/bindings/mtd/marvell-nand.txt
  
  MARVELL SOC MMC/SD/SDIO CONTROLLER DRIVER
@@@ -8676,15 -8616,6 +8693,15 @@@ F:    Documentation/ABI/testing/sysfs-bus-
  F:    drivers/iio/potentiometer/mcp4018.c
  F:    drivers/iio/potentiometer/mcp4531.c
  
 +MCR20A IEEE-802.15.4 RADIO DRIVER
 +M:    Xue Liu <liuxuenetmail@gmail.com>
 +L:    linux-wpan@vger.kernel.org
 +W:    https://github.com/xueliu/mcr20a-linux
 +S:    Maintained
 +F:    drivers/net/ieee802154/mcr20a.c
 +F:    drivers/net/ieee802154/mcr20a.h
 +F:    Documentation/devicetree/bindings/net/ieee802154/mcr20a.txt
 +
  MEASUREMENT COMPUTING CIO-DAC IIO DRIVER
  M:    William Breathitt Gray <vilhelm.gray@gmail.com>
  L:    linux-iio@vger.kernel.org
@@@ -8701,14 -8632,6 +8718,14 @@@ T:    git git://linuxtv.org/media_tree.gi
  S:    Supported
  F:    drivers/media/dvb-frontends/ascot2e*
  
 +MEDIA DRIVERS FOR CXD2099AR CI CONTROLLERS
 +M:    Jasmin Jessich <jasmin@anw.at>
 +L:    linux-media@vger.kernel.org
 +W:    https://linuxtv.org
 +T:    git git://linuxtv.org/media_tree.git
 +S:    Maintained
 +F:    drivers/media/dvb-frontends/cxd2099*
 +
  MEDIA DRIVERS FOR CXD2841ER
  M:    Sergey Kozlov <serjk@netup.ru>
  M:    Abylay Ospan <aospan@netup.ru>
@@@ -8719,15 -8642,6 +8736,15 @@@ T:    git git://linuxtv.org/media_tree.gi
  S:    Supported
  F:    drivers/media/dvb-frontends/cxd2841er*
  
 +MEDIA DRIVERS FOR CXD2880
 +M:    Yasunari Takiguchi <Yasunari.Takiguchi@sony.com>
 +L:    linux-media@vger.kernel.org
 +W:    http://linuxtv.org/
 +T:    git git://linuxtv.org/media_tree.git
 +S:    Supported
 +F:    drivers/media/dvb-frontends/cxd2880/*
 +F:    drivers/media/spi/cxd2880*
 +
  MEDIA DRIVERS FOR DIGITAL DEVICES PCIE DEVICES
  M:    Daniel Scheller <d.scheller.oss@gmail.com>
  L:    linux-media@vger.kernel.org
@@@ -8795,16 -8709,6 +8812,16 @@@ T:    git git://linuxtv.org/media_tree.gi
  S:    Supported
  F:    drivers/media/pci/netup_unidvb/*
  
 +MEDIA DRIVERS FOR RENESAS - CEU
 +M:    Jacopo Mondi <jacopo@jmondi.org>
 +L:    linux-media@vger.kernel.org
 +L:    linux-renesas-soc@vger.kernel.org
 +T:    git git://linuxtv.org/media_tree.git
 +S:    Supported
 +F:    Documentation/devicetree/bindings/media/renesas,ceu.txt
 +F:    drivers/media/platform/renesas-ceu.c
 +F:    include/media/drv-intf/renesas-ceu.h
 +
  MEDIA DRIVERS FOR RENESAS - DRIF
  M:    Ramesh Shanmugasundaram <ramesh.shanmugasundaram@bp.renesas.com>
  L:    linux-media@vger.kernel.org
@@@ -8904,15 -8808,6 +8921,15 @@@ M:    Sean Wang <sean.wang@mediatek.com
  S:    Maintained
  F:    drivers/media/rc/mtk-cir.c
  
 +MEDIATEK DMA DRIVER
 +M:    Sean Wang <sean.wang@mediatek.com>
 +L:    dmaengine@vger.kernel.org
 +L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 +L:    linux-mediatek@lists.infradead.org (moderated for non-subscribers)
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/dma/mtk-*
 +F:    drivers/dma/mediatek/
 +
  MEDIATEK PMIC LED DRIVER
  M:    Sean Wang <sean.wang@mediatek.com>
  S:    Maintained
@@@ -9138,7 -9033,6 +9155,7 @@@ M:      Vadim Pasternak <vadimp@mellanox.com
  L:    linux-leds@vger.kernel.org
  S:    Supported
  F:    drivers/leds/leds-mlxcpld.c
 +F:    drivers/leds/leds-mlxreg.c
  F:    Documentation/leds/leds-mlxcpld.txt
  
  MELLANOX PLATFORM DRIVER
@@@ -9170,9 -9064,10 +9187,9 @@@ F:     mm
  MEMORY TECHNOLOGY DEVICES (MTD)
  M:    David Woodhouse <dwmw2@infradead.org>
  M:    Brian Norris <computersforpeace@gmail.com>
 -M:    Boris Brezillon <boris.brezillon@free-electrons.com>
 +M:    Boris Brezillon <boris.brezillon@bootlin.com>
  M:    Marek Vasut <marek.vasut@gmail.com>
  M:    Richard Weinberger <richard@nod.at>
 -M:    Cyrille Pitchen <cyrille.pitchen@wedev4u.fr>
  L:    linux-mtd@lists.infradead.org
  W:    http://www.linux-mtd.infradead.org/
  Q:    http://patchwork.ozlabs.org/project/linux-mtd/list/
@@@ -9216,6 -9111,20 +9233,6 @@@ F:     drivers/media/platform/meson/ao-cec.
  F:    Documentation/devicetree/bindings/media/meson-ao-cec.txt
  T:    git git://linuxtv.org/media_tree.git
  
 -METAG ARCHITECTURE
 -M:    James Hogan <jhogan@kernel.org>
 -L:    linux-metag@vger.kernel.org
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/metag.git
 -S:    Odd Fixes
 -F:    arch/metag/
 -F:    Documentation/metag/
 -F:    Documentation/devicetree/bindings/metag/
 -F:    Documentation/devicetree/bindings/interrupt-controller/img,*
 -F:    drivers/clocksource/metag_generic.c
 -F:    drivers/irqchip/irq-metag.c
 -F:    drivers/irqchip/irq-metag-ext.c
 -F:    drivers/tty/metag_da.c
 -
  MICROBLAZE ARCHITECTURE
  M:    Michal Simek <monstr@monstr.eu>
  W:    http://www.monstr.eu/fdt/
@@@ -9257,7 -9166,7 +9274,7 @@@ M:      Wenyou Yang <wenyou.yang@microchip.c
  M:    Josh Wu <rainyfeeling@outlook.com>
  L:    linux-mtd@lists.infradead.org
  S:    Supported
 -F:    drivers/mtd/nand/atmel/*
 +F:    drivers/mtd/nand/raw/atmel/*
  F:    Documentation/devicetree/bindings/mtd/atmel-nand.txt
  
  MICROCHIP KSZ SERIES ETHERNET SWITCH DRIVER
@@@ -9270,13 -9179,6 +9287,13 @@@ F:    drivers/net/dsa/microchip/
  F:    include/linux/platform_data/microchip-ksz.h
  F:    Documentation/devicetree/bindings/net/dsa/ksz.txt
  
 +MICROCHIP LAN743X ETHERNET DRIVER
 +M:    Bryan Whitehead <bryan.whitehead@microchip.com>
 +M:    Microchip Linux Driver Support <UNGLinuxDriver@microchip.com>
 +L:    netdev@vger.kernel.org
 +S:    Maintained
 +F:    drivers/net/ethernet/microchip/lan743x_*
 +
  MICROCHIP USB251XB DRIVER
  M:    Richard Leitner <richard.leitner@skidata.com>
  L:    linux-usb@vger.kernel.org
@@@ -9284,15 -9186,6 +9301,15 @@@ S:    Maintaine
  F:    drivers/usb/misc/usb251xb.c
  F:    Documentation/devicetree/bindings/usb/usb251xb.txt
  
 +MICROSEMI MIPS SOCS
 +M:    Alexandre Belloni <alexandre.belloni@bootlin.com>
 +L:    linux-mips@linux-mips.org
 +S:    Maintained
 +F:    arch/mips/generic/board-ocelot.c
 +F:    arch/mips/configs/generic/board-ocelot.config
 +F:    arch/mips/boot/dts/mscc/
 +F:    Documentation/devicetree/bindings/mips/mscc.txt
 +
  MICROSEMI SMART ARRAY SMARTPQI DRIVER (smartpqi)
  M:    Don Brace <don.brace@microsemi.com>
  L:    esc.storagedev@microsemi.com
@@@ -9513,14 -9406,6 +9530,14 @@@ S:    Maintaine
  F:    drivers/media/i2c/mt9t001.c
  F:    include/media/i2c/mt9t001.h
  
 +MT9T112 APTINA CAMERA SENSOR
 +M:    Jacopo Mondi <jacopo@jmondi.org>
 +L:    linux-media@vger.kernel.org
 +T:    git git://linuxtv.org/media_tree.git
 +S:    Odd Fixes
 +F:    drivers/media/i2c/mt9t112.c
 +F:    include/media/i2c/mt9t112.h
 +
  MT9V032 APTINA CAMERA SENSOR
  M:    Laurent Pinchart <laurent.pinchart@ideasonboard.com>
  L:    linux-media@vger.kernel.org
@@@ -9598,7 -9483,7 +9615,7 @@@ S:      Supporte
  F:    drivers/net/ethernet/myricom/myri10ge/
  
  NAND FLASH SUBSYSTEM
 -M:    Boris Brezillon <boris.brezillon@free-electrons.com>
 +M:    Boris Brezillon <boris.brezillon@bootlin.com>
  R:    Richard Weinberger <richard@nod.at>
  L:    linux-mtd@lists.infradead.org
  W:    http://www.linux-mtd.infradead.org/
@@@ -9790,7 -9675,6 +9807,7 @@@ F:      include/uapi/linux/net_namespace.
  F:    tools/testing/selftests/net/
  F:    lib/net_utils.c
  F:    lib/random32.c
 +F:    Documentation/networking/
  
  NETWORKING [IPSEC]
  M:    Steffen Klassert <steffen.klassert@secunet.com>
@@@ -10068,13 -9952,6 +10085,13 @@@ F:  Documentation/ABI/stable/sysfs-bus-n
  F:    include/linux/nvmem-consumer.h
  F:    include/linux/nvmem-provider.h
  
 +NXP SGTL5000 DRIVER
 +M:    Fabio Estevam <fabio.estevam@nxp.com>
 +L:    alsa-devel@alsa-project.org (moderated for non-subscribers)
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/sound/sgtl5000.txt
 +F:    sound/soc/codecs/sgtl5000*
 +
  NXP TDA998X DRM DRIVER
  M:    Russell King <linux@armlinux.org.uk>
  S:    Supported
@@@ -10327,13 -10204,6 +10344,13 @@@ T: git git://linuxtv.org/media_tree.gi
  S:    Maintained
  F:    drivers/media/i2c/ov13858.c
  
 +OMNIVISION OV2685 SENSOR DRIVER
 +M:    Shunqian Zheng <zhengsq@rock-chips.com>
 +L:    linux-media@vger.kernel.org
 +T:    git git://linuxtv.org/media_tree.git
 +S:    Maintained
 +F:    drivers/media/i2c/ov2685.c
 +
  OMNIVISION OV5640 SENSOR DRIVER
  M:    Steve Longerbeam <slongerbeam@gmail.com>
  L:    linux-media@vger.kernel.org
@@@ -10348,13 -10218,6 +10365,13 @@@ T: git git://linuxtv.org/media_tree.gi
  S:    Maintained
  F:    drivers/media/i2c/ov5647.c
  
 +OMNIVISION OV5695 SENSOR DRIVER
 +M:    Shunqian Zheng <zhengsq@rock-chips.com>
 +L:    linux-media@vger.kernel.org
 +T:    git git://linuxtv.org/media_tree.git
 +S:    Maintained
 +F:    drivers/media/i2c/ov5695.c
 +
  OMNIVISION OV7670 SENSOR DRIVER
  M:    Jonathan Corbet <corbet@lwn.net>
  L:    linux-media@vger.kernel.org
@@@ -10363,14 -10226,6 +10380,14 @@@ S: Maintaine
  F:    drivers/media/i2c/ov7670.c
  F:    Documentation/devicetree/bindings/media/i2c/ov7670.txt
  
 +OMNIVISION OV772x SENSOR DRIVER
 +M:    Jacopo Mondi <jacopo@jmondi.org>
 +L:    linux-media@vger.kernel.org
 +T:    git git://linuxtv.org/media_tree.git
 +S:    Odd fixes
 +F:    drivers/media/i2c/ov772x.c
 +F:    include/media/i2c/ov772x.h
 +
  OMNIVISION OV7740 SENSOR DRIVER
  M:    Wenyou Yang <wenyou.yang@microchip.com>
  L:    linux-media@vger.kernel.org
@@@ -10379,21 -10234,11 +10396,21 @@@ S:        Maintaine
  F:    drivers/media/i2c/ov7740.c
  F:    Documentation/devicetree/bindings/media/i2c/ov7740.txt
  
 +OMNIVISION OV9650 SENSOR DRIVER
 +M:    Sakari Ailus <sakari.ailus@linux.intel.com>
 +R:    Akinobu Mita <akinobu.mita@gmail.com>
 +R:    Sylwester Nawrocki <s.nawrocki@samsung.com>
 +L:    linux-media@vger.kernel.org
 +T:    git git://linuxtv.org/media_tree.git
 +S:    Maintained
 +F:    drivers/media/i2c/ov9650.c
 +F:    Documentation/devicetree/bindings/media/i2c/ov9650.txt
 +
  ONENAND FLASH DRIVER
  M:    Kyungmin Park <kyungmin.park@samsung.com>
  L:    linux-mtd@lists.infradead.org
  S:    Maintained
 -F:    drivers/mtd/onenand/
 +F:    drivers/mtd/nand/onenand/
  F:    include/linux/mtd/onenand*.h
  
  ONSTREAM SCSI TAPE DRIVER
@@@ -10509,7 -10354,7 +10526,7 @@@ F:   drivers/oprofile
  F:    include/linux/oprofile.h
  
  ORACLE CLUSTER FILESYSTEM 2 (OCFS2)
 -M:    Mark Fasheh <mfasheh@versity.com>
 +M:    Mark Fasheh <mark@fasheh.com>
  M:    Joel Becker <jlbec@evilplan.org>
  L:    ocfs2-devel@oss.oracle.com (moderated for non-subscribers)
  W:    http://ocfs2.wiki.kernel.org
@@@ -10590,6 -10435,14 +10607,6 @@@ L:  platform-driver-x86@vger.kernel.or
  S:    Maintained
  F:    drivers/platform/x86/panasonic-laptop.c
  
 -PANASONIC MN10300/AM33/AM34 PORT
 -M:    David Howells <dhowells@redhat.com>
 -L:    linux-am33-list@redhat.com (moderated for non-subscribers)
 -W:    ftp://ftp.redhat.com/pub/redhat/gnupro/AM33/
 -S:    Maintained
 -F:    Documentation/mn10300/
 -F:    arch/mn10300/
 -
  PARALLEL LCD/KEYPAD PANEL DRIVER
  M:    Willy Tarreau <willy@haproxy.com>
  M:    Ksenija Stanojevic <ksenija.stanojevic@gmail.com>
@@@ -10890,7 -10743,6 +10907,7 @@@ F:   drivers/acpi/pci
  F:    drivers/pci/
  F:    include/asm-generic/pci*
  F:    include/linux/pci*
 +F:    include/linux/of_pci.h
  F:    include/uapi/linux/pci*
  F:    lib/pci*
  F:    arch/x86/pci/
@@@ -10902,11 -10754,11 +10919,11 @@@ L:        linux-pci@vger.kernel.or
  Q:    http://patchwork.ozlabs.org/project/linux-pci/list/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/lpieralisi/pci.git/
  S:    Supported
 +F:    drivers/pci/cadence/
  F:    drivers/pci/host/
  F:    drivers/pci/dwc/
  
  PCIE DRIVER FOR AXIS ARTPEC
 -M:    Niklas Cassel <niklas.cassel@axis.com>
  M:    Jesper Nilsson <jesper.nilsson@axis.com>
  L:    linux-arm-kernel@axis.com
  L:    linux-pci@vger.kernel.org
@@@ -11012,7 -10864,6 +11029,7 @@@ F:   drivers/platform/x86/peaq-wmi.
  PER-CPU MEMORY ALLOCATOR
  M:    Tejun Heo <tj@kernel.org>
  M:    Christoph Lameter <cl@linux.com>
 +M:    Dennis Zhou <dennisszhou@gmail.com>
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu.git
  S:    Maintained
  F:    include/linux/percpu*.h
@@@ -11106,17 -10957,6 +11123,17 @@@ L: linux-gpio@vger.kernel.or
  S:    Supported
  F:    drivers/pinctrl/pinctrl-at91-pio4.*
  
 +PIN CONTROLLER - FREESCALE
 +M:    Dong Aisheng <aisheng.dong@nxp.com>
 +M:    Fabio Estevam <festevam@gmail.com>
 +M:    Shawn Guo <shawnguo@kernel.org>
 +M:    Stefan Agner <stefan@agner.ch>
 +R:    Pengutronix Kernel Team <kernel@pengutronix.de>
 +L:    linux-gpio@vger.kernel.org
 +S:    Maintained
 +F:    drivers/pinctrl/freescale/
 +F:    Documentation/devicetree/bindings/pinctrl/fsl,*
 +
  PIN CONTROLLER - INTEL
  M:    Mika Westerberg <mika.westerberg@linux.intel.com>
  M:    Heikki Krogerus <heikki.krogerus@linux.intel.com>
@@@ -11193,7 -11033,7 +11210,7 @@@ F:   include/linux/pktcdvd.
  F:    include/uapi/linux/pktcdvd.h
  
  PKUNITY SOC DRIVERS
 -M:    Guan Xuetao <gxt@mprc.pku.edu.cn>
 +M:    Guan Xuetao <gxt@pku.edu.cn>
  W:    http://mprc.pku.edu.cn/~guanxuetao/linux
  S:    Maintained
  T:    git git://github.com/gxt/linux.git
@@@ -11519,6 -11359,12 +11536,6 @@@ F:  include/sound/pxa2xx-lib.
  F:    sound/arm/pxa*
  F:    sound/soc/pxa/
  
 -PXA3xx NAND FLASH DRIVER
 -M:    Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
 -L:    linux-mtd@lists.infradead.org
 -S:    Maintained
 -F:    drivers/mtd/nand/pxa3xx_nand.c
 -
  QAT DRIVER
  M:    Giovanni Cabiddu <giovanni.cabiddu@intel.com>
  L:    qat-linux@intel.com
@@@ -11538,7 -11384,6 +11555,7 @@@ M:   "Michael S. Tsirkin" <mst@redhat.com
  L:    qemu-devel@nongnu.org
  S:    Maintained
  F:    drivers/firmware/qemu_fw_cfg.c
 +F:    include/uapi/linux/qemu_fw_cfg.h
  
  QIB DRIVER
  M:    Dennis Dalessandro <dennis.dalessandro@intel.com>
@@@ -11807,7 -11652,7 +11824,7 @@@ F:   drivers/char/random.
  
  RAPIDIO SUBSYSTEM
  M:    Matt Porter <mporter@kernel.crashing.org>
 -M:    Alexandre Bounine <alexandre.bounine@idt.com>
 +M:    Alexandre Bounine <alex.bou9@gmail.com>
  S:    Maintained
  F:    drivers/rapidio/
  
@@@ -11881,7 -11726,7 +11898,7 @@@ X:   kernel/torture.
  
  REAL TIME CLOCK (RTC) SUBSYSTEM
  M:    Alessandro Zummo <a.zummo@towertech.it>
 -M:    Alexandre Belloni <alexandre.belloni@free-electrons.com>
 +M:    Alexandre Belloni <alexandre.belloni@bootlin.com>
  L:    linux-rtc@vger.kernel.org
  Q:    http://patchwork.ozlabs.org/project/rtc-linux/list/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git
@@@ -11945,11 -11790,6 +11962,11 @@@ T: git git://git.kernel.org/pub/scm/lin
  S:    Supported
  F:    drivers/clk/renesas/
  
 +RENESAS EMEV2 I2C DRIVER
 +M:    Wolfram Sang <wsa+renesas@sang-engineering.com>
 +S:    Supported
 +F:    drivers/i2c/busses/i2c-emev2.c
 +
  RENESAS ETHERNET DRIVERS
  R:    Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
  L:    netdev@vger.kernel.org
@@@ -11965,12 -11805,6 +11982,12 @@@ L: linux-iio@vger.kernel.or
  S:    Supported
  F:    drivers/iio/adc/rcar_gyro_adc.c
  
 +RENESAS R-CAR I2C DRIVERS
 +M:    Wolfram Sang <wsa+renesas@sang-engineering.com>
 +S:    Supported
 +F:    drivers/i2c/busses/i2c-rcar.c
 +F:    drivers/i2c/busses/i2c-sh_mobile.c
 +
  RENESAS USB PHY DRIVER
  M:    Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
  L:    linux-renesas-soc@vger.kernel.org
@@@ -12014,8 -11848,8 +12031,8 @@@ F:   drivers/memstick/host/r592.
  RICOH SMARTMEDIA/XD DRIVER
  M:    Maxim Levitsky <maximlevitsky@gmail.com>
  S:    Maintained
 -F:    drivers/mtd/nand/r852.c
 -F:    drivers/mtd/nand/r852.h
 +F:    drivers/mtd/nand/raw/r852.c
 +F:    drivers/mtd/nand/raw/r852.h
  
  RISC-V ARCHITECTURE
  M:    Palmer Dabbelt <palmer@sifive.com>
@@@ -12174,16 -12008,16 +12191,16 @@@ F:        Documentation/s390
  F:    Documentation/driver-api/s390-drivers.rst
  
  S390 COMMON I/O LAYER
 -M:    Sebastian Ott <sebott@linux.vnet.ibm.com>
 -M:    Peter Oberparleiter <oberpar@linux.vnet.ibm.com>
 +M:    Sebastian Ott <sebott@linux.ibm.com>
 +M:    Peter Oberparleiter <oberpar@linux.ibm.com>
  L:    linux-s390@vger.kernel.org
  W:    http://www.ibm.com/developerworks/linux/linux390/
  S:    Supported
  F:    drivers/s390/cio/
  
  S390 DASD DRIVER
 -M:    Stefan Haberland <sth@linux.vnet.ibm.com>
 -M:    Jan Hoeppner <hoeppner@linux.vnet.ibm.com>
 +M:    Stefan Haberland <sth@linux.ibm.com>
 +M:    Jan Hoeppner <hoeppner@linux.ibm.com>
  L:    linux-s390@vger.kernel.org
  W:    http://www.ibm.com/developerworks/linux/linux390/
  S:    Supported
@@@ -12198,8 -12032,8 +12215,8 @@@ S:   Supporte
  F:    drivers/iommu/s390-iommu.c
  
  S390 IUCV NETWORK LAYER
 -M:    Julian Wiedmann <jwi@linux.vnet.ibm.com>
 -M:    Ursula Braun <ubraun@linux.vnet.ibm.com>
 +M:    Julian Wiedmann <jwi@linux.ibm.com>
 +M:    Ursula Braun <ubraun@linux.ibm.com>
  L:    linux-s390@vger.kernel.org
  W:    http://www.ibm.com/developerworks/linux/linux390/
  S:    Supported
@@@ -12208,15 -12042,15 +12225,15 @@@ F:        include/net/iucv
  F:    net/iucv/
  
  S390 NETWORK DRIVERS
 -M:    Julian Wiedmann <jwi@linux.vnet.ibm.com>
 -M:    Ursula Braun <ubraun@linux.vnet.ibm.com>
 +M:    Julian Wiedmann <jwi@linux.ibm.com>
 +M:    Ursula Braun <ubraun@linux.ibm.com>
  L:    linux-s390@vger.kernel.org
  W:    http://www.ibm.com/developerworks/linux/linux390/
  S:    Supported
  F:    drivers/s390/net/
  
  S390 PCI SUBSYSTEM
 -M:    Sebastian Ott <sebott@linux.vnet.ibm.com>
 +M:    Sebastian Ott <sebott@linux.ibm.com>
  M:    Gerald Schaefer <gerald.schaefer@de.ibm.com>
  L:    linux-s390@vger.kernel.org
  W:    http://www.ibm.com/developerworks/linux/linux390/
@@@ -12226,8 -12060,8 +12243,8 @@@ F:   drivers/pci/hotplug/s390_pci_hpc.
  
  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>
 +M:    Dong Jia Shi <bjsdjshi@linux.ibm.com>
 +M:    Halil Pasic <pasic@linux.ibm.com>
  L:    linux-s390@vger.kernel.org
  L:    kvm@vger.kernel.org
  S:    Supported
@@@ -12243,8 -12077,8 +12260,8 @@@ S:   Supporte
  F:    drivers/s390/crypto/
  
  S390 ZFCP DRIVER
 -M:    Steffen Maier <maier@linux.vnet.ibm.com>
 -M:    Benjamin Block <bblock@linux.vnet.ibm.com>
 +M:    Steffen Maier <maier@linux.ibm.com>
 +M:    Benjamin Block <bblock@linux.ibm.com>
  L:    linux-s390@vger.kernel.org
  W:    http://www.ibm.com/developerworks/linux/linux390/
  S:    Supported
@@@ -12290,7 -12124,6 +12307,7 @@@ M:   Sylwester Nawrocki <s.nawrocki@samsu
  L:    alsa-devel@alsa-project.org (moderated for non-subscribers)
  S:    Supported
  F:    sound/soc/samsung/
 +F:    Documentation/devicetree/bindings/sound/samsung*
  
  SAMSUNG EXYNOS PSEUDO RANDOM NUMBER GENERATOR (RNG) DRIVER
  M:    Krzysztof Kozlowski <krzk@kernel.org>
@@@ -12389,7 -12222,6 +12406,7 @@@ M:   Tomasz Figa <tomasz.figa@gmail.com
  M:    Chanwoo Choi <cw00.choi@samsung.com>
  S:    Supported
  L:    linux-samsung-soc@vger.kernel.org (moderated for non-subscribers)
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/snawrocki/clk.git
  F:    drivers/clk/samsung/
  F:    include/dt-bindings/clock/exynos*.h
  F:    Documentation/devicetree/bindings/clock/exynos*.txt
@@@ -12397,7 -12229,7 +12414,7 @@@
  SAMSUNG SPI DRIVERS
  M:    Kukjin Kim <kgene@kernel.org>
  M:    Krzysztof Kozlowski <krzk@kernel.org>
 -M:    Andi Shyti <andi.shyti@samsung.com>
 +M:    Andi Shyti <andi@etezian.org>
  L:    linux-spi@vger.kernel.org
  L:    linux-samsung-soc@vger.kernel.org (moderated for non-subscribers)
  S:    Maintained
@@@ -12451,6 -12283,13 +12468,6 @@@ F:  include/linux/sched.
  F:    include/uapi/linux/sched.h
  F:    include/linux/wait.h
  
 -SCORE ARCHITECTURE
 -M:    Chen Liqin <liqin.linux@gmail.com>
 -M:    Lennox Wu <lennox.wu@gmail.com>
 -W:    http://www.sunplus.com
 -S:    Supported
 -F:    arch/score/
 -
  SCR24X CHIP CARD INTERFACE DRIVER
  M:    Lubomir Rintel <lkundrak@v3.sk>
  S:    Supported
@@@ -12681,7 -12520,7 +12698,7 @@@ S:   Maintaine
  F:    drivers/misc/sgi-xp/
  
  SHARED MEMORY COMMUNICATIONS (SMC) SOCKETS
 -M:    Ursula Braun <ubraun@linux.vnet.ibm.com>
 +M:    Ursula Braun <ubraun@linux.ibm.com>
  L:    linux-s390@vger.kernel.org
  W:    http://www.ibm.com/developerworks/linux/linux390/
  S:    Supported
@@@ -12841,8 -12680,7 +12858,8 @@@ F:   include/linux/siphash.
  
  SIOX
  M:    Gavin Schenk <g.schenk@eckelmann.de>
 -M:    Uwe Kleine-König <kernel@pengutronix.de>
 +M:    Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
 +R:    Pengutronix Kernel Team <kernel@pengutronix.de>
  S:    Supported
  F:    drivers/siox/*
  F:    include/trace/events/siox.h
@@@ -12979,20 -12817,14 +12996,20 @@@ S:        Maintaine
  F:    drivers/net/ethernet/smsc/smsc9420.*
  
  SOC-CAMERA V4L2 SUBSYSTEM
 -M:    Guennadi Liakhovetski <g.liakhovetski@gmx.de>
  L:    linux-media@vger.kernel.org
  T:    git git://linuxtv.org/media_tree.git
 -S:    Maintained
 +S:    Orphan
  F:    include/media/soc*
  F:    drivers/media/i2c/soc_camera/
  F:    drivers/media/platform/soc_camera/
  
 +SOCIONEXT SYNQUACER I2C DRIVER
 +M:    Ard Biesheuvel <ard.biesheuvel@linaro.org>
 +L:    linux-i2c@vger.kernel.org
 +S:    Maintained
 +F:    drivers/i2c/busses/i2c-synquacer.c
 +F:    Documentation/devicetree/bindings/i2c/i2c-synquacer.txt
 +
  SOCIONEXT UNIPHIER SOUND DRIVER
  M:    Katsuhiro Suzuki <suzuki.katsuhiro@socionext.com>
  L:    alsa-devel@alsa-project.org (moderated for non-subscribers)
@@@ -13051,19 -12883,6 +13068,19 @@@ S: Maintaine
  F:    drivers/net/ethernet/socionext/netsec.c
  F:    Documentation/devicetree/bindings/net/socionext-netsec.txt
  
 +SOLIDRUN CLEARFOG SUPPORT
 +M:    Russell King <linux@armlinux.org.uk>
 +S:    Maintained
 +F:    arch/arm/boot/dts/armada-388-clearfog*
 +F:    arch/arm/boot/dts/armada-38x-solidrun-*
 +
 +SOLIDRUN CUBOX-I/HUMMINGBOARD SUPPORT
 +M:    Russell King <linux@armlinux.org.uk>
 +S:    Maintained
 +F:    arch/arm/boot/dts/imx6*-cubox-i*
 +F:    arch/arm/boot/dts/imx6*-hummingboard*
 +F:    arch/arm/boot/dts/imx6*-sr-*
 +
  SONIC NETWORK DRIVER
  M:    Thomas Bogendoerfer <tsbogend@alpha.franken.de>
  L:    netdev@vger.kernel.org
@@@ -13220,6 -13039,7 +13237,6 @@@ F:   arch/arm/boot/dts/spear
  F:    arch/arm/mach-spear/
  
  SPI NOR SUBSYSTEM
 -M:    Cyrille Pitchen <cyrille.pitchen@wedev4u.fr>
  M:    Marek Vasut <marek.vasut@gmail.com>
  L:    linux-mtd@lists.infradead.org
  W:    http://www.linux-mtd.infradead.org/
@@@ -13549,12 -13369,6 +13566,12 @@@ S: Maintaine
  F:    drivers/gpio/gpio-dwapb.c
  F:    Documentation/devicetree/bindings/gpio/snps-dwapb-gpio.txt
  
 +SYNOPSYS DESIGNWARE AXI DMAC DRIVER
 +M:    Eugeniy Paltsev <Eugeniy.Paltsev@synopsys.com>
 +S:    Maintained
 +F:    drivers/dma/dwi-axi-dmac/
 +F:    Documentation/devicetree/bindings/dma/snps,dw-axi-dmac.txt
 +
  SYNOPSYS DESIGNWARE DMAC DRIVER
  M:    Viresh Kumar <vireshk@kernel.org>
  R:    Andy Shevchenko <andriy.shevchenko@linux.intel.com>
@@@ -13598,16 -13412,15 +13615,16 @@@ T:        git git://git.kernel.org/pub/scm/lin
  S:    Supported
  F:    drivers/mfd/syscon.c
  
 -SYSTEM CONTROL & POWER INTERFACE (SCPI) Message Protocol drivers
 +SYSTEM CONTROL & POWER/MANAGEMENT INTERFACE (SCPI/SCMI) Message Protocol drivers
  M:    Sudeep Holla <sudeep.holla@arm.com>
  L:    linux-arm-kernel@lists.infradead.org
  S:    Maintained
 -F:    Documentation/devicetree/bindings/arm/arm,scpi.txt
 -F:    drivers/clk/clk-scpi.c
 -F:    drivers/cpufreq/scpi-cpufreq.c
 +F:    Documentation/devicetree/bindings/arm/arm,sc[mp]i.txt
 +F:    drivers/clk/clk-sc[mp]i.c
 +F:    drivers/cpufreq/sc[mp]i-cpufreq.c
  F:    drivers/firmware/arm_scpi.c
 -F:    include/linux/scpi_protocol.h
 +F:    drivers/firmware/arm_scmi/
 +F:    include/linux/sc[mp]i_protocol.h
  
  SYSTEM RESET/SHUTDOWN DRIVERS
  M:    Sebastian Reichel <sre@kernel.org>
@@@ -13723,14 -13536,6 +13740,14 @@@ T: git git://linuxtv.org/mkrufky/tuners
  S:    Maintained
  F:    drivers/media/tuners/tda18271*
  
 +TDA1997x MEDIA DRIVER
 +M:    Tim Harvey <tharvey@gateworks.com>
 +L:    linux-media@vger.kernel.org
 +W:    https://linuxtv.org
 +Q:    http://patchwork.linuxtv.org/project/linux-media/list/
 +S:    Maintained
 +F:    drivers/media/i2c/tda1997x.*
 +
  TDA827x MEDIA DRIVER
  M:    Michael Krufky <mkrufky@linuxtv.org>
  L:    linux-media@vger.kernel.org
@@@ -13812,12 -13617,6 +13829,12 @@@ L: linux-media@vger.kernel.or
  S:    Maintained
  F:    drivers/media/rc/ttusbir.c
  
 +TECHWELL TW9910 VIDEO DECODER
 +L:    linux-media@vger.kernel.org
 +S:    Orphan
 +F:    drivers/media/i2c/tw9910.c
 +F:    include/media/i2c/tw9910.h
 +
  TEE SUBSYSTEM
  M:    Jens Wiklander <jens.wiklander@linaro.org>
  S:    Maintained
@@@ -13853,8 -13652,7 +13870,8 @@@ S:   Supporte
  F:    drivers/i2c/busses/i2c-tegra.c
  
  TEGRA IOMMU DRIVERS
 -M:    Hiroshi Doyu <hdoyu@nvidia.com>
 +M:    Thierry Reding <thierry.reding@gmail.com>
 +L:    linux-tegra@vger.kernel.org
  S:    Supported
  F:    drivers/iommu/tegra*
  
@@@ -13962,7 -13760,7 +13979,7 @@@ THUNDERBOLT DRIVE
  M:    Andreas Noever <andreas.noever@gmail.com>
  M:    Michael Jamet <michael.jamet@intel.com>
  M:    Mika Westerberg <mika.westerberg@linux.intel.com>
 -M:    Yehezkel Bernat <yehezkel.bernat@intel.com>
 +M:    Yehezkel Bernat <YehezkelShB@gmail.com>
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt.git
  S:    Maintained
  F:    Documentation/admin-guide/thunderbolt.rst
@@@ -13972,7 -13770,7 +13989,7 @@@ F:   include/linux/thunderbolt.
  THUNDERBOLT NETWORK DRIVER
  M:    Michael Jamet <michael.jamet@intel.com>
  M:    Mika Westerberg <mika.westerberg@linux.intel.com>
 -M:    Yehezkel Bernat <yehezkel.bernat@intel.com>
 +M:    Yehezkel Bernat <YehezkelShB@gmail.com>
  L:    netdev@vger.kernel.org
  S:    Maintained
  F:    drivers/net/thunderbolt.c
@@@ -14027,13 -13825,6 +14044,13 @@@ F: arch/arm/mach-davinci
  F:    drivers/i2c/busses/i2c-davinci.c
  F:    arch/arm/boot/dts/da850*
  
 +TI DAVINCI SERIES CLOCK DRIVER
 +M:    David Lechner <david@lechnology.com>
 +R:    Sekhar Nori <nsekhar@ti.com>
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/clock/ti/davinci/
 +F:    drivers/clk/davinci/
 +
  TI DAVINCI SERIES GPIO DRIVER
  M:    Keerthy <j-keerthy@ti.com>
  L:    linux-gpio@vger.kernel.org
@@@ -14149,6 -13940,19 +14166,6 @@@ S:  Orpha
  F:    drivers/net/wireless/ti/
  F:    include/linux/wl12xx.h
  
 -TILE ARCHITECTURE
 -W:    http://www.mellanox.com/repository/solutions/tile-scm/
 -S:    Orphan
 -F:    arch/tile/
 -F:    drivers/char/tile-srom.c
 -F:    drivers/edac/tile_edac.c
 -F:    drivers/net/ethernet/tile/
 -F:    drivers/rtc/rtc-tile.c
 -F:    drivers/tty/hvc/hvc_tile.c
 -F:    drivers/tty/serial/tilegx.c
 -F:    drivers/usb/host/*-tilegx.c
 -F:    include/linux/usb/tilegx.h
 -
  TIMEKEEPING, CLOCKSOURCE CORE, NTP, ALARMTIMER
  M:    John Stultz <john.stultz@linaro.org>
  M:    Thomas Gleixner <tglx@linutronix.de>
@@@ -14474,7 -14278,7 +14491,7 @@@ F:   include/linux/uwb.
  F:    include/linux/uwb/
  
  UNICORE32 ARCHITECTURE:
 -M:    Guan Xuetao <gxt@mprc.pku.edu.cn>
 +M:    Guan Xuetao <gxt@pku.edu.cn>
  W:    http://mprc.pku.edu.cn/~guanxuetao/linux
  S:    Maintained
  T:    git git://github.com/gxt/linux.git
@@@ -14613,12 -14417,6 +14630,12 @@@ S: Maintaine
  F:    Documentation/hid/hiddev.txt
  F:    drivers/hid/usbhid/
  
 +USB INTEL XHCI ROLE MUX DRIVER
 +M:    Hans de Goede <hdegoede@redhat.com>
 +L:    linux-usb@vger.kernel.org
 +S:    Maintained
 +F:    drivers/usb/roles/intel-xhci-usb-role-switch.c
 +
  USB ISP116X DRIVER
  M:    Olav Kongas <ok@artecdesign.ee>
  L:    linux-usb@vger.kernel.org
@@@ -14749,12 -14547,6 +14766,12 @@@ F: drivers/usb
  F:    include/linux/usb.h
  F:    include/linux/usb/
  
 +USB TYPEC PI3USB30532 MUX DRIVER
 +M:    Hans de Goede <hdegoede@redhat.com>
 +L:    linux-usb@vger.kernel.org
 +S:    Maintained
 +F:    drivers/usb/typec/mux/pi3usb30532.c
 +
  USB TYPEC SUBSYSTEM
  M:    Heikki Krogerus <heikki.krogerus@linux.intel.com>
  L:    linux-usb@vger.kernel.org
@@@ -14876,7 -14668,7 +14893,7 @@@ VF610 NAND DRIVE
  M:    Stefan Agner <stefan@agner.ch>
  L:    linux-mtd@lists.infradead.org
  S:    Supported
 -F:    drivers/mtd/nand/vf610_nfc.c
 +F:    drivers/mtd/nand/raw/vf610_nfc.c
  
  VFAT/FAT/MSDOS FILESYSTEM
  M:    OGAWA Hirofumi <hirofumi@mail.parknet.co.jp>
@@@ -14904,7 -14696,7 +14921,7 @@@ F:   include/linux/mdev.
  F:    samples/vfio-mdev/
  
  VFIO PLATFORM DRIVER
 -M:    Baptiste Reynal <b.reynal@virtualopensystems.com>
 +M:    Eric Auger <eric.auger@redhat.com>
  L:    kvm@vger.kernel.org
  S:    Maintained
  F:    drivers/vfio/platform/
@@@ -15024,7 -14816,7 +15041,7 @@@ F:   include/uapi/linux/virtio_crypto.
  
  VIRTIO DRIVERS FOR S390
  M:    Cornelia Huck <cohuck@redhat.com>
 -M:    Halil Pasic <pasic@linux.vnet.ibm.com>
 +M:    Halil Pasic <pasic@linux.ibm.com>
  L:    linux-s390@vger.kernel.org
  L:    virtualization@lists.linux-foundation.org
  L:    kvm@vger.kernel.org
@@@ -15139,7 -14931,7 +15156,7 @@@ F:   drivers/input/mouse/vmmouse.
  F:    drivers/input/mouse/vmmouse.h
  
  VMWARE VMXNET3 ETHERNET DRIVER
 -M:    Shrikrishna Khare <skhare@vmware.com>
 +M:    Ronak Doshi <doshir@vmware.com>
  M:    "VMware, Inc." <pv-drivers@vmware.com>
  L:    netdev@vger.kernel.org
  S:    Maintained

diff --combined drivers/iio/adc/meson_saradc.c
index ede955d9b2a4d67582ab596fc48cc032dae3158b,a5d481a2b4efa1841d024b865df618a3eaf83e95..2948909f3ee3117b31bcdec6421990f55c7344ba
--- 1/drivers/iio/adc/meson_saradc.c
--- 2/drivers/iio/adc/meson_saradc.c
+++ b/drivers/iio/adc/meson_saradc.c
@@@ -219,15 -219,19 +219,19 @@@ enum meson_sar_adc_chan7_mux_sel 
        CHAN7_MUX_CH7_INPUT = 0x7,
  };
  
- struct meson_sar_adc_data {
+ struct meson_sar_adc_param {
        bool                                    has_bl30_integration;
        unsigned long                           clock_rate;
        u32                                     bandgap_reg;
        unsigned int                            resolution;
-       const char                              *name;
        const struct regmap_config              *regmap_config;
  };
  
+ struct meson_sar_adc_data {
+       const struct meson_sar_adc_param        *param;
+       const char                              *name;
+ };
+ 
  struct meson_sar_adc_priv {
        struct regmap                           *regmap;
        struct regulator                        *vref;
@@@ -276,7 -280,7 +280,7 @@@ static int meson_sar_adc_calib_val(stru
        /* use val_calib = scale * val_raw + offset calibration function */
        tmp = div_s64((s64)val * priv->calibscale, MILLION) + priv->calibbias;
  
-       return clamp(tmp, 0, (1 << priv->data->resolution) - 1);
+       return clamp(tmp, 0, (1 << priv->data->param->resolution) - 1);
  }
  
  static int meson_sar_adc_wait_busy_clear(struct iio_dev *indio_dev)
@@@ -328,7 -332,7 +332,7 @@@ static int meson_sar_adc_read_raw_sampl
        }
  
        fifo_val = FIELD_GET(MESON_SAR_ADC_FIFO_RD_SAMPLE_VALUE_MASK, regval);
-       fifo_val &= GENMASK(priv->data->resolution - 1, 0);
+       fifo_val &= GENMASK(priv->data->param->resolution - 1, 0);
        *val = meson_sar_adc_calib_val(indio_dev, fifo_val);
  
        return 0;
@@@ -447,7 -451,7 +451,7 @@@ static int meson_sar_adc_lock(struct ii
  
        mutex_lock(&indio_dev->mlock);
  
-       if (priv->data->has_bl30_integration) {
+       if (priv->data->param->has_bl30_integration) {
                /* prevent BL30 from using the SAR ADC while we are using it */
                regmap_update_bits(priv->regmap, MESON_SAR_ADC_DELAY,
                                MESON_SAR_ADC_DELAY_KERNEL_BUSY,
@@@ -462,10 -466,8 +466,10 @@@
                        regmap_read(priv->regmap, MESON_SAR_ADC_DELAY, &val);
                } while (val & MESON_SAR_ADC_DELAY_BL30_BUSY && timeout--);
  
 -              if (timeout < 0)
 +              if (timeout < 0) {
 +                      mutex_unlock(&indio_dev->mlock);
                        return -ETIMEDOUT;
 +              }
        }
  
        return 0;
@@@ -475,7 -477,7 +479,7 @@@ static void meson_sar_adc_unlock(struc
  {
        struct meson_sar_adc_priv *priv = iio_priv(indio_dev);
  
-       if (priv->data->has_bl30_integration)
+       if (priv->data->param->has_bl30_integration)
                /* allow BL30 to use the SAR ADC again */
                regmap_update_bits(priv->regmap, MESON_SAR_ADC_DELAY,
                                MESON_SAR_ADC_DELAY_KERNEL_BUSY, 0);
@@@ -559,7 -561,7 +563,7 @@@ static int meson_sar_adc_iio_info_read_
                }
  
                *val = ret / 1000;
-               *val2 = priv->data->resolution;
+               *val2 = priv->data->param->resolution;
                return IIO_VAL_FRACTIONAL_LOG2;
  
        case IIO_CHAN_INFO_CALIBBIAS:
@@@ -632,7 -634,7 +636,7 @@@ static int meson_sar_adc_init(struct ii
         */
        meson_sar_adc_set_chan7_mux(indio_dev, CHAN7_MUX_CH7_INPUT);
  
-       if (priv->data->has_bl30_integration) {
+       if (priv->data->param->has_bl30_integration) {
                /*
                 * leave sampling delay and the input clocks as configured by
                 * BL30 to make sure BL30 gets the values it expects when
@@@ -712,7 -714,7 +716,7 @@@
                return ret;
        }
  
-       ret = clk_set_rate(priv->adc_clk, priv->data->clock_rate);
+       ret = clk_set_rate(priv->adc_clk, priv->data->param->clock_rate);
        if (ret) {
                dev_err(indio_dev->dev.parent,
                        "failed to set adc clock rate\n");
@@@ -725,14 -727,15 +729,15 @@@
  static void meson_sar_adc_set_bandgap(struct iio_dev *indio_dev, bool on_off)
  {
        struct meson_sar_adc_priv *priv = iio_priv(indio_dev);
+       const struct meson_sar_adc_param *param = priv->data->param;
        u32 enable_mask;
  
-       if (priv->data->bandgap_reg == MESON_SAR_ADC_REG11)
+       if (param->bandgap_reg == MESON_SAR_ADC_REG11)
                enable_mask = MESON_SAR_ADC_REG11_BANDGAP_EN;
        else
                enable_mask = MESON_SAR_ADC_DELTA_10_TS_VBG_EN;
  
-       regmap_update_bits(priv->regmap, priv->data->bandgap_reg, enable_mask,
+       regmap_update_bits(priv->regmap, param->bandgap_reg, enable_mask,
                           on_off ? enable_mask : 0);
  }
  
@@@ -844,8 -847,8 +849,8 @@@ static int meson_sar_adc_calib(struct i
        int ret, nominal0, nominal1, value0, value1;
  
        /* use points 25% and 75% for calibration */
-       nominal0 = (1 << priv->data->resolution) / 4;
-       nominal1 = (1 << priv->data->resolution) * 3 / 4;
+       nominal0 = (1 << priv->data->param->resolution) / 4;
+       nominal1 = (1 << priv->data->param->resolution) * 3 / 4;
  
        meson_sar_adc_set_chan7_mux(indio_dev, CHAN7_MUX_VDD_DIV4);
        usleep_range(10, 20);
@@@ -883,51 -886,60 +888,60 @@@ static const struct iio_info meson_sar_
        .read_raw = meson_sar_adc_iio_info_read_raw,
  };
  
- static const struct meson_sar_adc_data meson_sar_adc_meson8_data = {
-       .has_bl30_integration = false,
-       .clock_rate = 1150000,
-       .bandgap_reg = MESON_SAR_ADC_DELTA_10,
-       .regmap_config = &meson_sar_adc_regmap_config_meson8,
-       .resolution = 10,
-       .name = "meson-meson8-saradc",
- };
- 
- static const struct meson_sar_adc_data meson_sar_adc_meson8b_data = {
+ static const struct meson_sar_adc_param meson_sar_adc_meson8_param = {
        .has_bl30_integration = false,
        .clock_rate = 1150000,
        .bandgap_reg = MESON_SAR_ADC_DELTA_10,
        .regmap_config = &meson_sar_adc_regmap_config_meson8,
        .resolution = 10,
-       .name = "meson-meson8b-saradc",
  };
  
- static const struct meson_sar_adc_data meson_sar_adc_gxbb_data = {
+ static const struct meson_sar_adc_param meson_sar_adc_gxbb_param = {
        .has_bl30_integration = true,
        .clock_rate = 1200000,
        .bandgap_reg = MESON_SAR_ADC_REG11,
        .regmap_config = &meson_sar_adc_regmap_config_gxbb,
        .resolution = 10,
-       .name = "meson-gxbb-saradc",
  };
  
- static const struct meson_sar_adc_data meson_sar_adc_gxl_data = {
+ static const struct meson_sar_adc_param meson_sar_adc_gxl_param = {
        .has_bl30_integration = true,
        .clock_rate = 1200000,
        .bandgap_reg = MESON_SAR_ADC_REG11,
        .regmap_config = &meson_sar_adc_regmap_config_gxbb,
        .resolution = 12,
+ };
+ 
+ static const struct meson_sar_adc_data meson_sar_adc_meson8_data = {
+       .param = &meson_sar_adc_meson8_param,
+       .name = "meson-meson8-saradc",
+ };
+ 
+ static const struct meson_sar_adc_data meson_sar_adc_meson8b_data = {
+       .param = &meson_sar_adc_meson8_param,
+       .name = "meson-meson8b-saradc",
+ };
+ 
+ static const struct meson_sar_adc_data meson_sar_adc_gxbb_data = {
+       .param = &meson_sar_adc_gxbb_param,
+       .name = "meson-gxbb-saradc",
+ };
+ 
+ static const struct meson_sar_adc_data meson_sar_adc_gxl_data = {
+       .param = &meson_sar_adc_gxl_param,
        .name = "meson-gxl-saradc",
  };
  
  static const struct meson_sar_adc_data meson_sar_adc_gxm_data = {
-       .has_bl30_integration = true,
-       .clock_rate = 1200000,
-       .bandgap_reg = MESON_SAR_ADC_REG11,
-       .regmap_config = &meson_sar_adc_regmap_config_gxbb,
-       .resolution = 12,
+       .param = &meson_sar_adc_gxl_param,
        .name = "meson-gxm-saradc",
  };
  
+ static const struct meson_sar_adc_data meson_sar_adc_axg_data = {
+       .param = &meson_sar_adc_gxl_param,
+       .name = "meson-axg-saradc",
+ };
+ 
  static const struct of_device_id meson_sar_adc_of_match[] = {
        {
                .compatible = "amlogic,meson8-saradc",
@@@ -946,6 -958,9 +960,9 @@@
        }, {
                .compatible = "amlogic,meson-gxm-saradc",
                .data = &meson_sar_adc_gxm_data,
+       }, {
+               .compatible = "amlogic,meson-axg-saradc",
+               .data = &meson_sar_adc_axg_data,
        },
        {},
  };
@@@ -1001,7 -1016,7 +1018,7 @@@ static int meson_sar_adc_probe(struct p
                return ret;
  
        priv->regmap = devm_regmap_init_mmio(&pdev->dev, base,
-                                            priv->data->regmap_config);
+                                            priv->data->param->regmap_config);
        if (IS_ERR(priv->regmap))
                return PTR_ERR(priv->regmap);
  

diff --combined drivers/iio/adc/stm32-dfsdm-adc.c
index 01422d11753cf39be105b9352e06746927d75731,cc8ab86c1caae5ed01f4375214d6d2108dfb270b..1b78becaba5d9d6a0eb10d48e256a9ecae8090a1
--- 1/drivers/iio/adc/stm32-dfsdm-adc.c
--- 2/drivers/iio/adc/stm32-dfsdm-adc.c
+++ b/drivers/iio/adc/stm32-dfsdm-adc.c
@@@ -54,6 -54,7 +54,6 @@@ struct stm32_dfsdm_adc 
        struct stm32_dfsdm *dfsdm;
        const struct stm32_dfsdm_dev_data *dev_data;
        unsigned int fl_id;
 -      unsigned int ch_id;
  
        /* ADC specific */
        unsigned int oversamp;
@@@ -253,7 -254,8 +253,8 @@@ static int stm32_dfsdm_start_filter(str
                                  DFSDM_CR1_RSWSTART(1));
  }
  
- static void stm32_dfsdm_stop_filter(struct stm32_dfsdm *dfsdm, unsigned int fl_id)
+ static void stm32_dfsdm_stop_filter(struct stm32_dfsdm *dfsdm,
+                                   unsigned int fl_id)
  {
        /* Disable conversion */
        regmap_update_bits(dfsdm->regmap, DFSDM_CR1(fl_id),
@@@ -337,7 -339,7 +338,7 @@@ static int stm32_dfsdm_channel_parse_of
                                            "st,adc-channel-types", chan_idx,
                                            &of_str);
        if (!ret) {
-               val  = stm32_dfsdm_str2val(of_str, stm32_dfsdm_chan_type);
+               val = stm32_dfsdm_str2val(of_str, stm32_dfsdm_chan_type);
                if (val < 0)
                        return val;
        } else {
@@@ -349,7 -351,7 +350,7 @@@
                                            "st,adc-channel-clk-src", chan_idx,
                                            &of_str);
        if (!ret) {
-               val  = stm32_dfsdm_str2val(of_str, stm32_dfsdm_chan_src);
+               val = stm32_dfsdm_str2val(of_str, stm32_dfsdm_chan_src);
                if (val < 0)
                        return val;
        } else {
@@@ -383,7 -385,7 +384,7 @@@ static ssize_t dfsdm_adc_audio_set_spic
  {
        struct stm32_dfsdm_adc *adc = iio_priv(indio_dev);
        struct stm32_dfsdm_filter *fl = &adc->dfsdm->fl_list[adc->fl_id];
 -      struct stm32_dfsdm_channel *ch = &adc->dfsdm->ch_list[adc->ch_id];
 +      struct stm32_dfsdm_channel *ch = &adc->dfsdm->ch_list[chan->channel];
        unsigned int sample_freq = adc->sample_freq;
        unsigned int spi_freq;
        int ret;
@@@ -418,20 -420,18 +419,20 @@@
        return len;
  }
  
 -static int stm32_dfsdm_start_conv(struct stm32_dfsdm_adc *adc, bool dma)
 +static int stm32_dfsdm_start_conv(struct stm32_dfsdm_adc *adc,
 +                                const struct iio_chan_spec *chan,
 +                                bool dma)
  {
        struct regmap *regmap = adc->dfsdm->regmap;
        int ret;
        unsigned int dma_en = 0, cont_en = 0;
  
 -      ret = stm32_dfsdm_start_channel(adc->dfsdm, adc->ch_id);
 +      ret = stm32_dfsdm_start_channel(adc->dfsdm, chan->channel);
        if (ret < 0)
                return ret;
  
        ret = stm32_dfsdm_filter_configure(adc->dfsdm, adc->fl_id,
 -                                         adc->ch_id);
 +                                         chan->channel);
        if (ret < 0)
                goto stop_channels;
  
@@@ -465,13 -465,12 +466,13 @@@ stop_channels
  
        regmap_update_bits(regmap, DFSDM_CR1(adc->fl_id),
                           DFSDM_CR1_RCONT_MASK, 0);
 -      stm32_dfsdm_stop_channel(adc->dfsdm, adc->fl_id);
 +      stm32_dfsdm_stop_channel(adc->dfsdm, chan->channel);
  
        return ret;
  }
  
 -static void stm32_dfsdm_stop_conv(struct stm32_dfsdm_adc *adc)
 +static void stm32_dfsdm_stop_conv(struct stm32_dfsdm_adc *adc,
 +                                const struct iio_chan_spec *chan)
  {
        struct regmap *regmap = adc->dfsdm->regmap;
  
@@@ -484,7 -483,7 +485,7 @@@
        regmap_update_bits(regmap, DFSDM_CR1(adc->fl_id),
                           DFSDM_CR1_RCONT_MASK, 0);
  
 -      stm32_dfsdm_stop_channel(adc->dfsdm, adc->ch_id);
 +      stm32_dfsdm_stop_channel(adc->dfsdm, chan->channel);
  }
  
  static int stm32_dfsdm_set_watermark(struct iio_dev *indio_dev,
@@@ -611,7 -610,6 +612,7 @@@ static int stm32_dfsdm_adc_dma_start(st
  static int stm32_dfsdm_postenable(struct iio_dev *indio_dev)
  {
        struct stm32_dfsdm_adc *adc = iio_priv(indio_dev);
 +      const struct iio_chan_spec *chan = &indio_dev->channels[0];
        int ret;
  
        /* Reset adc buffer index */
@@@ -621,7 -619,7 +622,7 @@@
        if (ret < 0)
                return ret;
  
 -      ret = stm32_dfsdm_start_conv(adc, true);
 +      ret = stm32_dfsdm_start_conv(adc, chan, true);
        if (ret) {
                dev_err(&indio_dev->dev, "Can't start conversion\n");
                goto stop_dfsdm;
@@@ -638,7 -636,7 +639,7 @@@
        return 0;
  
  err_stop_conv:
 -      stm32_dfsdm_stop_conv(adc);
 +      stm32_dfsdm_stop_conv(adc, chan);
  stop_dfsdm:
        stm32_dfsdm_stop_dfsdm(adc->dfsdm);
  
@@@ -648,12 -646,11 +649,12 @@@
  static int stm32_dfsdm_predisable(struct iio_dev *indio_dev)
  {
        struct stm32_dfsdm_adc *adc = iio_priv(indio_dev);
 +      const struct iio_chan_spec *chan = &indio_dev->channels[0];
  
        if (adc->dma_chan)
                dmaengine_terminate_all(adc->dma_chan);
  
 -      stm32_dfsdm_stop_conv(adc);
 +      stm32_dfsdm_stop_conv(adc, chan);
  
        stm32_dfsdm_stop_dfsdm(adc->dfsdm);
  
@@@ -734,7 -731,7 +735,7 @@@ static int stm32_dfsdm_single_conv(stru
        if (ret < 0)
                goto stop_dfsdm;
  
 -      ret = stm32_dfsdm_start_conv(adc, false);
 +      ret = stm32_dfsdm_start_conv(adc, chan, false);
        if (ret < 0) {
                regmap_update_bits(adc->dfsdm->regmap, DFSDM_CR2(adc->fl_id),
                                   DFSDM_CR2_REOCIE_MASK, DFSDM_CR2_REOCIE(0));
@@@ -755,7 -752,7 +756,7 @@@
        else
                ret = IIO_VAL_INT;
  
 -      stm32_dfsdm_stop_conv(adc);
 +      stm32_dfsdm_stop_conv(adc, chan);
  
  stop_dfsdm:
        stm32_dfsdm_stop_dfsdm(adc->dfsdm);
@@@ -769,7 -766,7 +770,7 @@@ static int stm32_dfsdm_write_raw(struc
  {
        struct stm32_dfsdm_adc *adc = iio_priv(indio_dev);
        struct stm32_dfsdm_filter *fl = &adc->dfsdm->fl_list[adc->fl_id];
 -      struct stm32_dfsdm_channel *ch = &adc->dfsdm->ch_list[adc->ch_id];
 +      struct stm32_dfsdm_channel *ch = &adc->dfsdm->ch_list[chan->channel];
        unsigned int spi_freq = adc->spi_freq;
        int ret = -EINVAL;
  
@@@ -976,6 -973,7 +977,6 @@@ static int stm32_dfsdm_adc_chan_init_on
        }
        ch->scan_type.realbits = 24;
        ch->scan_type.storagebits = 32;
 -      adc->ch_id = ch->channel;
  
        return stm32_dfsdm_chan_configure(adc->dfsdm,
                                          &adc->dfsdm->ch_list[ch->channel]);
@@@ -1004,7 -1002,7 +1005,7 @@@ static int stm32_dfsdm_audio_init(struc
        }
        ch->info_mask_separate = BIT(IIO_CHAN_INFO_SAMP_FREQ);
  
 -      d_ch = &adc->dfsdm->ch_list[adc->ch_id];
 +      d_ch = &adc->dfsdm->ch_list[ch->channel];
        if (d_ch->src != DFSDM_CHANNEL_SPI_CLOCK_EXTERNAL)
                adc->spi_freq = adc->dfsdm->spi_master_freq;
  
@@@ -1045,8 -1043,8 +1046,8 @@@ static int stm32_dfsdm_adc_init(struct 
                return -ENOMEM;
  
        for (chan_idx = 0; chan_idx < num_ch; chan_idx++) {
 -              ch->scan_index = chan_idx;
 -              ret = stm32_dfsdm_adc_chan_init_one(indio_dev, ch);
 +              ch[chan_idx].scan_index = chan_idx;
 +              ret = stm32_dfsdm_adc_chan_init_one(indio_dev, &ch[chan_idx]);
                if (ret < 0) {
                        dev_err(&indio_dev->dev, "Channels init failed\n");
                        return ret;
@@@ -1093,7 -1091,6 +1094,6 @@@ static int stm32_dfsdm_adc_probe(struc
        char *name;
        int ret, irq, val;
  
- 
        dev_data = of_device_get_match_data(dev);
        iio = devm_iio_device_alloc(dev, sizeof(*adc));
        if (!iio) {
@@@ -1111,8 -1108,8 +1111,8 @@@
        platform_set_drvdata(pdev, adc);
  
        ret = of_property_read_u32(dev->of_node, "reg", &adc->fl_id);
-       if (ret != 0) {
-               dev_err(dev, "Missing reg property\n");
+       if (ret != 0 || adc->fl_id >= adc->dfsdm->num_fls) {
+               dev_err(dev, "Missing or bad reg property\n");
                return -EINVAL;
        }
  
@@@ -1161,7 -1158,6 +1161,6 @@@
        if (ret < 0)
                goto err_cleanup;
  
-       dev_err(dev, "of_platform_populate\n");
        if (dev_data->type == DFSDM_AUDIO) {
                ret = of_platform_populate(np, NULL, NULL, dev);
                if (ret < 0) {

diff --combined drivers/iio/adc/stm32-dfsdm-core.c
index e50efdcc41ff38c04b87c31c20d4e5c8f542deac,540d42cf6f4cefbe737d01da9db0eba7b0c7439b..1d0d8238d9b55aabde4db39c0b2880b25b69cb96
--- 1/drivers/iio/adc/stm32-dfsdm-core.c
--- 2/drivers/iio/adc/stm32-dfsdm-core.c
+++ b/drivers/iio/adc/stm32-dfsdm-core.c
@@@ -83,7 -83,7 +83,7 @@@ int stm32_dfsdm_start_dfsdm(struct stm3
  {
        struct dfsdm_priv *priv = container_of(dfsdm, struct dfsdm_priv, dfsdm);
        struct device *dev = &priv->pdev->dev;
 -      unsigned int clk_div = priv->spi_clk_out_div;
 +      unsigned int clk_div = priv->spi_clk_out_div, clk_src;
        int ret;
  
        if (atomic_inc_return(&priv->n_active_ch) == 1) {
@@@ -100,14 -100,6 +100,14 @@@
                        }
                }
  
 +              /* select clock source, e.g. 0 for "dfsdm" or 1 for "audio" */
 +              clk_src = priv->aclk ? 1 : 0;
 +              ret = regmap_update_bits(dfsdm->regmap, DFSDM_CHCFGR1(0),
 +                                       DFSDM_CHCFGR1_CKOUTSRC_MASK,
 +                                       DFSDM_CHCFGR1_CKOUTSRC(clk_src));
 +              if (ret < 0)
 +                      goto disable_aclk;
 +
                /* Output the SPI CLKOUT (if clk_div == 0 clock if OFF) */
                ret = regmap_update_bits(dfsdm->regmap, DFSDM_CHCFGR1(0),
                                         DFSDM_CHCFGR1_CKOUTDIV_MASK,
@@@ -227,6 -219,11 +227,11 @@@ static int stm32_dfsdm_parse_of(struct 
        }
  
        priv->spi_clk_out_div = div_u64_rem(clk_freq, spi_freq, &rem) - 1;
+       if (!priv->spi_clk_out_div) {
+               /* spi_clk_out_div == 0 means ckout is OFF */
+               dev_err(&pdev->dev, "spi-max-frequency not achievable\n");
+               return -EINVAL;
+       }
        priv->dfsdm.spi_master_freq = spi_freq;
  
        if (rem) {
@@@ -282,7 -279,7 +287,7 @@@ static int stm32_dfsdm_probe(struct pla
  
        dfsdm->regmap = devm_regmap_init_mmio_clk(&pdev->dev, "dfsdm",
                                                  dfsdm->base,
 -                                                &stm32h7_dfsdm_regmap_cfg);
 +                                                dev_data->regmap_cfg);
        if (IS_ERR(dfsdm->regmap)) {
                ret = PTR_ERR(dfsdm->regmap);
                dev_err(&pdev->dev, "%s: Failed to allocate regmap: %d\n",

diff --combined drivers/iio/dac/Kconfig
index 76db0768e4542af29343c985997cb836be414f33,c77c6cf1d2ba1385797945e9c8c9eb591576763f..06e90debb9f5ef68dfade69a9aeb64e199619dee
--- 1/drivers/iio/dac/Kconfig
--- 2/drivers/iio/dac/Kconfig
+++ b/drivers/iio/dac/Kconfig
@@@ -131,16 -131,31 +131,31 @@@ config LTC263
          module will be called ltc2632.
  
  config AD5686
-       tristate "Analog Devices AD5686R/AD5685R/AD5684R DAC SPI driver"
+       tristate
+ 
+ config AD5686_SPI
+       tristate "Analog Devices AD5686 and similar multi-channel DACs (SPI)"
        depends on SPI
+       select AD5686
        help
-         Say yes here to build support for Analog Devices AD5686R, AD5685R,
-         AD5684R, AD5791 Voltage Output Digital to
-         Analog Converter.
+         Say yes here to build support for Analog Devices AD5672R, AD5676,
+         AD5676R, AD5684, AD5684R, AD5684R, AD5685R, AD5686, AD5686R.
+         Voltage Output Digital to Analog Converter.
  
          To compile this driver as a module, choose M here: the
          module will be called ad5686.
  
+ config AD5696_I2C
+       tristate "Analog Devices AD5696 and similar multi-channel DACs (I2C)"
+       depends on I2C
+       select AD5686
+       help
+         Say yes here to build support for Analog Devices AD5671R, AD5675R,
+         AD5694, AD5694R, AD5695R, AD5696, AD5696R Voltage Output Digital to
+         Analog Converter.
+         To compile this driver as a module, choose M here: the module will be
+         called ad5696.
+ 
  config AD5755
        tristate "Analog Devices AD5755/AD5755-1/AD5757/AD5735/AD5737 DAC driver"
        depends on SPI_MASTER
@@@ -195,8 -210,7 +210,8 @@@ config AD730
  
  config CIO_DAC
        tristate "Measurement Computing CIO-DAC IIO driver"
 -      depends on X86 && ISA_BUS_API
 +      depends on X86 && (ISA_BUS || PC104)
 +      select ISA_BUS_API
        help
          Say yes here to build support for the Measurement Computing CIO-DAC
          analog output device family (CIO-DAC16, CIO-DAC08, PC104-DAC06). The
@@@ -321,6 -335,16 +336,16 @@@ config TI_DAC082S08
  
          If compiled as a module, it will be called ti-dac082s085.
  
+ config TI_DAC5571
+       tristate "Texas Instruments 8/10/12/16-bit 1/2/4-channel DAC driver"
+       depends on I2C
+       help
+         Driver for the Texas Instruments
+         DAC5571, DAC6571, DAC7571, DAC5574, DAC6574, DAC7574, DAC5573,
+         DAC6573, DAC7573, DAC8571, DAC8574.
+ 
+         If compiled as a module, it will be called ti-dac5571.
+ 
  config VF610_DAC
        tristate "Vybrid vf610 DAC driver"
        depends on OF