Merge branch 'master' into for-4.20/upstream-fixes

Pull in a merge commit that brought in 3b692c55e58d ("HID: asus: only
support backlight when it's not driven by WMI") so that fixup could be
applied on top of it.

diff --combined MAINTAINERS
index 4715cb8d9584474880ac683a89669caaf24e659d,245ba32f53649a6897816da12439cd1cc4a5b737..2f9723c075c397e3a68e0b4c8347d475a8642207
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -376,7 -376,7 +376,7 @@@ F: drivers/platform/x86/i2c-multi-insta
  ACPI PMIC DRIVERS
  M:    "Rafael J. Wysocki" <[email protected]>
  M:    Len Brown <[email protected]>
- R:    Andy Shevchenko <and[email protected]>
+ R:    Andy Shevchenko <and[email protected]>
  R:    Mika Westerberg <[email protected]>
  L:    [email protected]
  Q:    https://patchwork.kernel.org/project/linux-acpi/list/
@@@ -535,7 -535,7 +535,7 @@@ F: Documentation/hwmon/adt747
  F:    drivers/hwmon/adt7475.c
  
  ADVANSYS SCSI DRIVER
- M:    Matthew Wilcox <[email protected]>
+ M:    Matthew Wilcox <[email protected]>
  M:    Hannes Reinecke <[email protected]>
  L:    [email protected]
  S:    Maintained
@@@ -549,6 -549,15 +549,15 @@@ W:       http://ez.analog.com/community/linux
  S:    Supported
  F:    drivers/input/misc/adxl34x.c
  
+ ADXL372 THREE-AXIS DIGITAL ACCELEROMETER DRIVER
+ M:    Stefan Popa <[email protected]>
+ W:    http://ez.analog.com/community/linux-device-drivers
+ S:    Supported
+ F:    drivers/iio/accel/adxl372.c
+ F:    drivers/iio/accel/adxl372_spi.c
+ F:    drivers/iio/accel/adxl372_i2c.c
+ F:    Documentation/devicetree/bindings/iio/accel/adxl372.txt
+ 
  AF9013 MEDIA DRIVER
  M:    Antti Palosaari <[email protected]>
  L:    [email protected]
@@@ -662,6 -671,13 +671,13 @@@ L:       [email protected]
  S:    Maintained
  F:    drivers/crypto/sunxi-ss/
  
+ ALLWINNER VPU DRIVER
+ M:    Maxime Ripard <[email protected]>
+ M:    Paul Kocialkowski <[email protected]>
+ L:    [email protected]
+ S:    Maintained
+ F:    drivers/staging/media/sunxi/cedrus/
+ 
  ALPHA PORT
  M:    Richard Henderson <[email protected]>
  M:    Ivan Kokshaysky <[email protected]>
@@@ -932,6 -948,7 +948,7 @@@ M: Greg Kroah-Hartman <gregkh@linuxfoun
  M:    Arve Hjønnevåg <[email protected]>
  M:    Todd Kjos <[email protected]>
  M:    Martijn Coenen <[email protected]>
+ M:    Joel Fernandes <[email protected]>
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git
  L:    [email protected]
  S:    Supported
@@@ -1077,6 -1094,29 +1094,29 @@@ F:    arch/arm/include/asm/arch_timer.
  F:    arch/arm64/include/asm/arch_timer.h
  F:    drivers/clocksource/arm_arch_timer.c
  
+ ARM INTEGRATOR, VERSATILE AND REALVIEW SUPPORT
+ M:    Linus Walleij <[email protected]>
+ L:    [email protected] (moderated for non-subscribers)
+ S:    Maintained
+ F:    Documentation/devicetree/bindings/arm/arm-boards
+ F:    Documentation/devicetree/bindings/auxdisplay/arm-charlcd.txt
+ F:    Documentation/devicetree/bindings/clock/arm-integrator.txt
+ F:    Documentation/devicetree/bindings/interrupt-controller/arm,versatile-fpga-irq.txt
+ F:    Documentation/devicetree/bindings/mtd/arm-versatile.txt
+ F:    arch/arm/mach-integrator/
+ F:    arch/arm/mach-realview/
+ F:    arch/arm/mach-versatile/
+ F:    arch/arm/plat-versatile/
+ F:    arch/arm/boot/dts/arm-realview-*
+ F:    arch/arm/boot/dts/integrator*
+ F:    arch/arm/boot/dts/versatile*
+ F:    drivers/clk/versatile/
+ F:    drivers/i2c/busses/i2c-versatile.c
+ F:    drivers/irqchip/irq-versatile-fpga.c
+ F:    drivers/mtd/maps/physmap_of_versatile.c
+ F:    drivers/power/reset/arm-versatile-reboot.c
+ F:    drivers/soc/versatile/
+ 
  ARM HDLCD DRM DRIVER
  M:    Liviu Dudau <[email protected]>
  S:    Supported
@@@ -1149,12 -1189,26 +1189,26 @@@ S:   Odd Fixe
  F:    drivers/mmc/host/mmci.*
  F:    include/linux/amba/mmci.h
  
+ ARM PRIMECELL SSP PL022 SPI DRIVER
+ M:    Linus Walleij <[email protected]>
+ L:    [email protected] (moderated for non-subscribers)
+ S:    Maintained
+ F:    Documentation/devicetree/bindings/spi/spi_pl022.txt
+ F:    drivers/spi/spi-pl022.c
+ 
  ARM PRIMECELL UART PL010 AND PL011 DRIVERS
  M:    Russell King <[email protected]>
  S:    Odd Fixes
  F:    drivers/tty/serial/amba-pl01*.c
  F:    include/linux/amba/serial.h
  
+ ARM PRIMECELL VIC PL190/PL192 DRIVER
+ M:    Linus Walleij <[email protected]>
+ L:    [email protected] (moderated for non-subscribers)
+ S:    Maintained
+ F:    Documentation/devicetree/bindings/interrupt-controller/arm,vic.txt
+ F:    drivers/irqchip/irq-vic.c
+ 
  ARM SMMU DRIVERS
  M:    Will Deacon <[email protected]>
  R:    Robin Murphy <[email protected]>
@@@ -1174,18 -1228,25 +1228,25 @@@ T:   git git://git.kernel.org/pub/scm/lin
  
  ARM/ACTIONS SEMI ARCHITECTURE
  M:    Andreas Färber <[email protected]>
+ R:    Manivannan Sadhasivam <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
  N:    owl
  F:    arch/arm/mach-actions/
  F:    arch/arm/boot/dts/owl-*
  F:    arch/arm64/boot/dts/actions/
- F:    drivers/clocksource/owl-*
+ F:    drivers/clk/actions/
+ F:    drivers/clocksource/timer-owl*
+ F:    drivers/dma/owl-dma.c
+ F:    drivers/i2c/busses/i2c-owl.c
  F:    drivers/pinctrl/actions/*
  F:    drivers/soc/actions/
  F:    include/dt-bindings/power/owl-*
  F:    include/linux/soc/actions/
  F:    Documentation/devicetree/bindings/arm/actions.txt
+ F:    Documentation/devicetree/bindings/clock/actions,owl-cmu.txt
+ F:    Documentation/devicetree/bindings/dma/owl-dma.txt
+ F:    Documentation/devicetree/bindings/i2c/i2c-owl.txt
  F:    Documentation/devicetree/bindings/pinctrl/actions,s900-pinctrl.txt
  F:    Documentation/devicetree/bindings/power/actions,owl-sps.txt
  F:    Documentation/devicetree/bindings/timer/actions,owl-timer.txt
@@@ -1461,7 -1522,9 +1522,9 @@@ F:      arch/arm/mach-mxs
  F:    arch/arm/boot/dts/imx*
  F:    arch/arm/configs/imx*_defconfig
  F:    drivers/clk/imx/
+ F:    drivers/firmware/imx/
  F:    drivers/soc/imx/
+ F:    include/linux/firmware/imx/
  F:    include/soc/imx/
  
  ARM/FREESCALE VYBRID ARM ARCHITECTURE
@@@ -1598,12 -1661,10 +1661,10 @@@ L:   [email protected]
  S:    Maintained
  
  ARM/LPC18XX ARCHITECTURE
- M:    Joachim Eastwood <manabian@gmail.com>
+ M:    Vladimir Zapolskiy <vz@mleia.com>
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
  F:    arch/arm/boot/dts/lpc43*
- F:    drivers/clk/nxp/clk-lpc18xx*
- F:    drivers/clocksource/time-lpc32xx.c
  F:    drivers/i2c/busses/i2c-lpc2k.c
  F:    drivers/memory/pl172.c
  F:    drivers/mtd/spi-nor/nxp-spifi.c
@@@ -1702,9 -1763,10 +1763,10 @@@ S:    Odd Fixe
  ARM/Microchip (AT91) SoC support
  M:    Nicolas Ferre <[email protected]>
  M:    Alexandre Belloni <[email protected]>
+ M:    Ludovic Desroches <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  W:    http://www.linux4sam.org
- T:    git git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91.git
+ T:    git git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux.git
  S:    Supported
  N:    at91
  N:    atmel
@@@ -2084,22 -2146,24 +2146,24 @@@ F:   include/linux/remoteproc/st_slim_rpr
  ARM/STM32 ARCHITECTURE
  M:    Maxime Coquelin <[email protected]>
  M:    Alexandre Torgue <[email protected]>
+ L:    [email protected] (moderated for non-subscribers)
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/atorgue/stm32.git stm32-next
  N:    stm32
+ N:    stm
  F:    arch/arm/boot/dts/stm32*
  F:    arch/arm/mach-stm32/
  F:    drivers/clocksource/armv7m_systick.c
  
- ARM/Synaptics Berlin SoC support
+ ARM/Synaptics SoC support
  M:    Jisheng Zhang <[email protected]>
  M:    Sebastian Hesselbarth <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
  F:    arch/arm/mach-berlin/
  F:    arch/arm/boot/dts/berlin*
- F:    arch/arm64/boot/dts/marvell/berlin*
+ F:    arch/arm64/boot/dts/synaptics/
  
  ARM/TANGO ARCHITECTURE
  M:    Marc Gonzalez <[email protected]>
@@@ -2220,7 -2284,7 +2284,7 @@@ F:      arch/arm/mach-vexpress
  F:    */*/vexpress*
  F:    */*/*/vexpress*
  F:    drivers/clk/versatile/clk-vexpress-osc.c
- F:    drivers/clocksource/versatile.c
+ F:    drivers/clocksource/timer-versatile.c
  N:    mps2
  
  ARM/VFP SUPPORT
@@@ -2242,7 -2306,7 +2306,7 @@@ M:      Tony Prisk <[email protected]
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
  F:    arch/arm/mach-vt8500/
- F:    drivers/clocksource/vt8500_timer.c
+ F:    drivers/clocksource/timer-vt8500.c
  F:    drivers/i2c/busses/i2c-wmt.c
  F:    drivers/mmc/host/wmt-sdmmc.c
  F:    drivers/pwm/pwm-vt8500.c
@@@ -2263,7 -2327,6 +2327,6 @@@ F:      arch/arm/mach-pxa/include/mach/z2.
  
  ARM/ZTE ARCHITECTURE
  M:    Jun Nie <[email protected]>
- M:    Baoyou Xie <[email protected]>
  M:    Shawn Guo <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
@@@ -2307,7 -2370,7 +2370,7 @@@ F:      drivers/cpuidle/cpuidle-zynq.
  F:    drivers/block/xsysace.c
  N:    zynq
  N:    xilinx
- F:    drivers/clocksource/cadence_ttc_timer.c
+ F:    drivers/clocksource/timer-cadence-ttc.c
  F:    drivers/i2c/busses/i2c-cadence.c
  F:    drivers/mmc/host/sdhci-of-arasan.c
  F:    drivers/edac/synopsys_edac.c
@@@ -2471,42 -2534,6 +2534,6 @@@ F:     drivers/atm
  F:    include/linux/atm*
  F:    include/uapi/linux/atm*
  
- ATMEL AT91 / AT32 MCI DRIVER
- M:    Ludovic Desroches <[email protected]>
- S:    Maintained
- F:    drivers/mmc/host/atmel-mci.c
- 
- ATMEL AT91 SAMA5D2-Compatible Shutdown Controller
- M:    Nicolas Ferre <[email protected]>
- S:    Supported
- F:    drivers/power/reset/at91-sama5d2_shdwc.c
- 
- ATMEL Audio ALSA driver
- M:    Nicolas Ferre <[email protected]>
- L:    [email protected] (moderated for non-subscribers)
- S:    Supported
- F:    sound/soc/atmel
- 
- ATMEL I2C DRIVER
- M:    Ludovic Desroches <[email protected]>
- L:    [email protected]
- S:    Supported
- F:    drivers/i2c/busses/i2c-at91.c
- 
- ATMEL ISI DRIVER
- M:    Ludovic Desroches <[email protected]>
- L:    [email protected]
- S:    Supported
- F:    drivers/media/platform/atmel/atmel-isi.c
- F:    include/media/atmel-isi.h
- 
- ATMEL LCDFB DRIVER
- M:    Nicolas Ferre <[email protected]>
- L:    [email protected]
- S:    Maintained
- F:    drivers/video/fbdev/atmel_lcdfb.c
- F:    include/video/atmel_lcdc.h
- 
  ATMEL MACB ETHERNET DRIVER
  M:    Nicolas Ferre <[email protected]>
  S:    Supported
@@@ -2519,43 -2546,6 +2546,6 @@@ S:     Maintaine
  F:    Documentation/devicetree/bindings/input/atmel,maxtouch.txt
  F:    drivers/input/touchscreen/atmel_mxt_ts.c
  
- ATMEL SAMA5D2 ADC DRIVER
- M:    Ludovic Desroches <[email protected]>
- L:    [email protected]
- S:    Supported
- F:    drivers/iio/adc/at91-sama5d2_adc.c
- 
- ATMEL SDMMC DRIVER
- M:    Ludovic Desroches <[email protected]>
- L:    [email protected]
- S:    Supported
- F:    drivers/mmc/host/sdhci-of-at91.c
- 
- ATMEL SPI DRIVER
- M:    Nicolas Ferre <[email protected]>
- S:    Supported
- F:    drivers/spi/spi-atmel.*
- 
- ATMEL SSC DRIVER
- M:    Nicolas Ferre <[email protected]>
- L:    [email protected] (moderated for non-subscribers)
- S:    Supported
- F:    drivers/misc/atmel-ssc.c
- F:    include/linux/atmel-ssc.h
- 
- ATMEL Timer Counter (TC) AND CLOCKSOURCE DRIVERS
- M:    Nicolas Ferre <[email protected]>
- L:    [email protected] (moderated for non-subscribers)
- S:    Supported
- F:    drivers/misc/atmel_tclib.c
- F:    drivers/clocksource/tcb_clksrc.c
- 
- ATMEL USBA UDC DRIVER
- M:    Nicolas Ferre <[email protected]>
- L:    [email protected] (moderated for non-subscribers)
- S:    Supported
- F:    drivers/usb/gadget/udc/atmel_usba_udc.*
- 
  ATMEL WIRELESS DRIVER
  M:    Simon Kelley <[email protected]>
  L:    [email protected]
@@@ -2564,13 -2554,6 +2554,6 @@@ W:     http://atmelwlandriver.sourceforge.n
  S:    Maintained
  F:    drivers/net/wireless/atmel/atmel*
  
- ATMEL XDMA DRIVER
- M:    Ludovic Desroches <[email protected]>
- L:    [email protected]
- L:    [email protected]
- S:    Supported
- F:    drivers/dma/at_xdmac.c
- 
  ATOMIC INFRASTRUCTURE
  M:    Will Deacon <[email protected]>
  M:    Peter Zijlstra <[email protected]>
@@@ -3184,7 -3167,7 +3167,7 @@@ F:      drivers/gpio/gpio-bt8xx.
  
  BTRFS FILE SYSTEM
  M:    Chris Mason <[email protected]>
- M:    Josef Bacik <jbacik@fb.com>
+ M:    Josef Bacik <josef@toxicpanda.com>
  M:    David Sterba <[email protected]>
  L:    [email protected]
  W:    http://btrfs.wiki.kernel.org/
@@@ -3228,6 -3211,15 +3211,15 @@@ T:    git git://git.alsa-project.org/alsa-
  S:    Maintained
  F:    sound/pci/oxygen/
  
+ C-SKY ARCHITECTURE
+ M:    Guo Ren <[email protected]>
+ T:    git https://github.com/c-sky/csky-linux.git
+ S:    Supported
+ F:    arch/csky/
+ F:    Documentation/devicetree/bindings/csky/
+ K:    csky
+ N:    csky
+ 
  C6X ARCHITECTURE
  M:    Mark Salter <[email protected]>
  M:    Aurelien Jacquiot <[email protected]>
@@@ -3838,7 -3830,6 +3830,6 @@@ W:      http://www.arm.com/products/processo
  S:    Maintained
  F:    drivers/cpufreq/arm_big_little.h
  F:    drivers/cpufreq/arm_big_little.c
- F:    drivers/cpufreq/arm_big_little_dt.c
  
  CPU POWER MONITORING SUBSYSTEM
  M:    Thomas Renninger <[email protected]>
@@@ -4055,7 -4046,7 +4046,7 @@@ M:      Uma Krishnan <[email protected]
  L:    [email protected]
  S:    Supported
  F:    drivers/scsi/cxlflash/
- F:    include/uapi/scsi/cxlflash_ioctls.h
+ F:    include/uapi/scsi/cxlflash_ioctl.h
  F:    Documentation/powerpc/cxlflash.txt
  
  CYBERPRO FB DRIVER
@@@ -4098,7 -4089,7 +4089,7 @@@ D-LINK DIR-685 TOUCHKEYS DRIVE
  M:    Linus Walleij <[email protected]>
  L:    [email protected]
  S:    Supported
- F:    drivers/input/dlink-dir685-touchkeys.c
+ F:    drivers/input/keyboard/dlink-dir685-touchkeys.c
  
  DALLAS/MAXIM DS1685-FAMILY REAL TIME CLOCK
  M:    Joshua Kinard <[email protected]>
@@@ -4216,6 -4207,12 +4207,12 @@@ M:    Pali Rohár <[email protected]
  S:    Maintained
  F:    drivers/platform/x86/dell-rbtn.*
  
+ DELL REMOTE BIOS UPDATE DRIVER
+ M:    Stuart Hayes <[email protected]>
+ L:    [email protected]
+ S:    Maintained
+ F:    drivers/platform/x86/dell_rbu.c
+ 
  DELL LAPTOP SMM DRIVER
  M:    Pali Rohár <[email protected]>
  S:    Maintained
@@@ -4223,10 -4220,11 +4220,11 @@@ F:   drivers/hwmon/dell-smm-hwmon.
  F:    include/uapi/linux/i8k.h
  
  DELL SYSTEMS MANAGEMENT BASE DRIVER (dcdbas)
- M:    Doug Warzecha <[email protected]>
+ M:    Stuart Hayes <[email protected]>
+ L:    [email protected]
  S:    Maintained
  F:    Documentation/dcdbas.txt
- F:    drivers/firmware/dcdbas.*
+ F:    drivers/platform/x86/dcdbas.*
  
  DELL WMI NOTIFICATIONS DRIVER
  M:    Matthew Garrett <[email protected]>
@@@ -4378,13 -4376,6 +4376,6 @@@ L:     [email protected]
  S:    Maintained
  F:    drivers/gpio/gpio-gpio-mm.c
  
- DIGI NEO AND CLASSIC PCI PRODUCTS
- M:    Lidza Louina <[email protected]>
- M:    Mark Hounschell <[email protected]>
- L:    [email protected]
- S:    Maintained
- F:    drivers/staging/dgnc/
- 
  DIOLAN U2C-12 I2C DRIVER
  M:    Guenter Roeck <[email protected]>
  L:    [email protected]
@@@ -4392,7 -4383,7 +4383,7 @@@ S:      Maintaine
  F:    drivers/i2c/busses/i2c-diolan-u2c.c
  
  FILESYSTEM DIRECT ACCESS (DAX)
- M:    Matthew Wilcox <[email protected]>
+ M:    Matthew Wilcox <[email protected]>
  M:    Ross Zwisler <[email protected]>
  M:    Jan Kara <[email protected]>
  L:    [email protected]
@@@ -4534,13 -4525,15 +4525,15 @@@ L:   [email protected]
  T:    git git://linuxtv.org/media_tree.git
  S:    Maintained
  F:    drivers/media/i2c/dw9714.c
+ F:    Documentation/devicetree/bindings/media/i2c/dongwoon,dw9714.txt
  
  DONGWOON DW9807 LENS VOICE COIL DRIVER
  M:    Sakari Ailus <[email protected]>
  L:    [email protected]
  T:    git git://linuxtv.org/media_tree.git
  S:    Maintained
- F:    drivers/media/i2c/dw9807.c
+ F:    drivers/media/i2c/dw9807-vcm.c
+ F:    Documentation/devicetree/bindings/media/i2c/dongwoon,dw9807-vcm.txt
  
  DOUBLETALK DRIVER
  M:    "James R. Van Zandt" <[email protected]>
@@@ -4755,8 -4748,11 +4748,11 @@@ F:    drivers/gpu/drm/tdfx
  
  DRM DRIVER FOR USB DISPLAYLINK VIDEO ADAPTERS
  M:    Dave Airlie <[email protected]>
+ R:    Sean Paul <[email protected]>
+ L:    [email protected]
  S:    Odd Fixes
  F:    drivers/gpu/drm/udl/
+ T:    git git://anongit.freedesktop.org/drm/drm-misc
  
  DRM DRIVER FOR VMWARE VIRTUAL GPU
  M:    "VMware Graphics" <[email protected]>
@@@ -4786,8 -4782,8 +4782,8 @@@ F:      include/uapi/drm
  F:    include/linux/vga*
  
  DRM DRIVERS AND MISC GPU PATCHES
- M:    Gustavo Padovan <[email protected]>
  M:    Maarten Lankhorst <[email protected]>
+ M:    Maxime Ripard <[email protected]>
  M:    Sean Paul <[email protected]>
  W:    https://01.org/linuxgraphics/gfx-docs/maintainer-tools/drm-misc.html
  S:    Maintained
@@@ -4856,6 -4852,7 +4852,7 @@@ F:      drivers/gpu/drm/fsl-dcu
  F:    Documentation/devicetree/bindings/display/fsl,dcu.txt
  F:    Documentation/devicetree/bindings/display/fsl,tcon.txt
  F:    Documentation/devicetree/bindings/display/panel/nec,nl4827hc19-05b.txt
+ T:    git git://anongit.freedesktop.org/drm/drm-misc
  
  DRM DRIVERS FOR FREESCALE IMX
  M:    Philipp Zabel <[email protected]>
@@@ -4905,9 -4902,10 +4902,10 @@@ F:    Documentation/devicetree/bindings/di
  
  DRM DRIVERS FOR RENESAS
  M:    Laurent Pinchart <[email protected]>
+ M:    Kieran Bingham <[email protected]>
  L:    [email protected]
  L:    [email protected]
- T:    git git://linuxtv.org/pinchartl/fbdev
+ T:    git git://linuxtv.org/pinchartl/media drm/du/next
  S:    Supported
  F:    drivers/gpu/drm/rcar-du/
  F:    drivers/gpu/drm/shmobile/
@@@ -5364,7 -5362,8 +5362,8 @@@ S:      Maintaine
  F:    drivers/edac/r82600_edac.c
  
  EDAC-SBRIDGE
- M:    Mauro Carvalho Chehab <[email protected]>
+ M:    Tony Luck <[email protected]>
+ R:    Qiuxu Zhuo <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    drivers/edac/sb_edac.c
@@@ -5381,6 -5380,14 +5380,14 @@@ L:    [email protected]
  S:    Maintained
  F:    drivers/edac/ti_edac.c
  
+ EDAC-QCOM
+ M:    Channagoud Kadabi <[email protected]>
+ M:    Venkata Narendra Kumar Gutta <[email protected]>
+ L:    [email protected]
+ L:    [email protected]
+ S:    Maintained
+ F:    drivers/edac/qcom_edac.c
+ 
  EDIROL UA-101/UA-1000 DRIVER
  M:    Clemens Ladisch <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
@@@ -5659,10 -5666,9 +5666,9 @@@ F:     Documentation/fault-injection
  F:    lib/fault-inject.c
  
  FBTFT Framebuffer drivers
- M:    Thomas Petazzoni <[email protected]>
+ S:    Orphan
  L:    [email protected]
  L:    [email protected]
- S:    Maintained
  F:    drivers/staging/fbtft/
  
  FC0011 TUNER DRIVER
@@@ -6588,9 -6594,9 +6594,9 @@@ F:      arch/*/include/asm/suspend*.
  
  HID CORE LAYER
  M:    Jiri Kosina <[email protected]>
 -R:    Benjamin Tissoires <[email protected]>
 +M:    Benjamin Tissoires <[email protected]>
  L:    [email protected]
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/hid/hid.git
  S:    Maintained
  F:    drivers/hid/
  F:    include/linux/hid*
@@@ -7348,6 -7354,12 +7354,12 @@@ L:    [email protected] (moderat
  S:    Supported
  F:    sound/soc/intel/
  
+ INTEL ATOMISP2 DUMMY / POWER-MANAGEMENT DRIVER
+ M:    Hans de Goede <[email protected]>
+ L:    [email protected]
+ S:    Maintained
+ F:    drivers/platform/x86/intel_atomisp2_pm.c
+ 
  INTEL C600 SERIES SAS CONTROLLER DRIVER
  M:    Intel SCU Linux support <[email protected]>
  M:    Artur Paszkiewicz <[email protected]>
@@@ -7534,7 -7546,6 +7546,6 @@@ M:      Rajneesh Bhardwaj <rajneesh.bhardwaj
  M:    Vishwanath Somayaji <[email protected]>
  L:    [email protected]
  S:    Maintained
- F:    arch/x86/include/asm/pmc_core.h
  F:    drivers/platform/x86/intel_pmc_core*
  
  INTEL PMC/P-Unit IPC DRIVER
@@@ -7577,16 -7588,9 +7588,9 @@@ S:     Supporte
  F:    drivers/infiniband/hw/i40iw/
  F:    include/uapi/rdma/i40iw-abi.h
  
- INTEL SHA MULTIBUFFER DRIVER
- M:    Megha Dey <[email protected]>
- R:    Tim Chen <[email protected]>
- L:    [email protected]
- S:    Supported
- F:    arch/x86/crypto/sha*-mb/
- F:    crypto/mcryptd.c
- 
  INTEL TELEMETRY DRIVER
- M:    Souvik Kumar Chakravarty <[email protected]>
+ M:    Rajneesh Bhardwaj <[email protected]>
+ M:    "David E. Box" <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    arch/x86/include/asm/intel_telemetry.h
@@@ -7729,7 -7733,6 +7733,6 @@@ IPX NETWORK LAYE
  L:    [email protected]
  S:    Obsolete
  F:    include/uapi/linux/ipx.h
- F:    drivers/staging/ipx/
  
  IRQ DOMAINS (IRQ NUMBER MAPPING LIBRARY)
  M:    Marc Zyngier <[email protected]>
@@@ -8164,6 -8167,7 +8167,7 @@@ F:      security/keys/encrypted-keys
  
  KEYS-TRUSTED
  M:    James Bottomley <[email protected]>
+ M:      Jarkko Sakkinen <[email protected]>
  M:    Mimi Zohar <[email protected]>
  L:    [email protected]
  L:    [email protected]
@@@ -8319,6 -8323,14 +8323,14 @@@ W:    http://legousb.sourceforge.net
  S:    Maintained
  F:    drivers/usb/misc/legousbtower.c
  
+ LG LAPTOP EXTRAS
+ M:    Matan Ziv-Av <[email protected]>
+ L:    [email protected]
+ S:    Maintained
+ F:    Documentation/ABI/testing/sysfs-platform-lg-laptop
+ F:    Documentation/laptops/lg-laptop.rst
+ F:    drivers/platform/x86/lg-laptop.c
+ 
  LG2160 MEDIA DRIVER
  M:    Michael Krufky <[email protected]>
  L:    [email protected]
@@@ -8702,11 -8714,18 +8714,18 @@@ F:   drivers/message/fusion
  F:    drivers/scsi/mpt3sas/
  
  LSILOGIC/SYMBIOS/NCR 53C8XX and 53C1010 PCI-SCSI drivers
- M:    Matthew Wilcox <[email protected]>
+ M:    Matthew Wilcox <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    drivers/scsi/sym53c8xx_2/
  
+ LTC1660 DAC DRIVER
+ M:    Marcus Folkesson <[email protected]>
+ L:    [email protected]
+ S:    Maintained
+ F:    Documentation/devicetree/bindings/iio/dac/ltc1660.txt
+ F:    drivers/iio/dac/ltc1660.c
+ 
  LTC4261 HARDWARE MONITOR DRIVER
  M:    Guenter Roeck <[email protected]>
  L:    [email protected]
@@@ -8871,7 -8890,7 +8890,7 @@@ S:      Maintaine
  F:    drivers/net/phy/marvell10g.c
  
  MARVELL MVNETA ETHERNET DRIVER
- M:    Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+ M:    Thomas Petazzoni <thomas.petazzoni@bootlin.com>
  L:    [email protected]
  S:    Maintained
  F:    drivers/net/ethernet/marvell/mvneta.*
@@@ -9070,11 -9089,10 +9089,10 @@@ F:   drivers/media/dvb-frontends/cxd2880/
  F:    drivers/media/spi/cxd2880*
  
  MEDIA DRIVERS FOR DIGITAL DEVICES PCIE DEVICES
- M:    Daniel Scheller <[email protected]>
  L:    [email protected]
  W:    https://linuxtv.org
  T:    git git://linuxtv.org/media_tree.git
- S:    Maintained
+ S:    Orphan
  F:    drivers/media/pci/ddbridge/*
  
  MEDIA DRIVERS FOR FREESCALE IMX
@@@ -9089,6 -9107,13 +9107,13 @@@ F:    drivers/staging/media/imx
  F:    include/linux/imx-media.h
  F:    include/media/imx.h
  
+ MEDIA DRIVER FOR FREESCALE IMX PXP
+ M:    Philipp Zabel <[email protected]>
+ L:    [email protected]
+ T:    git git://linuxtv.org/media_tree.git
+ S:    Maintained
+ F:    drivers/media/platform/imx-pxp.[ch]
+ 
  MEDIA DRIVERS FOR HELENE
  M:    Abylay Ospan <[email protected]>
  L:    [email protected]
@@@ -9119,11 -9144,10 +9144,10 @@@ S:   Supporte
  F:    drivers/media/dvb-frontends/lnbh25*
  
  MEDIA DRIVERS FOR MXL5XX TUNER DEMODULATORS
- M:    Daniel Scheller <[email protected]>
  L:    [email protected]
  W:    https://linuxtv.org
  T:    git git://linuxtv.org/media_tree.git
- S:    Maintained
+ S:    Orphan
  F:    drivers/media/dvb-frontends/mxl5xx*
  
  MEDIA DRIVERS FOR NETUP PCI UNIVERSAL DVB devices
@@@ -9166,7 -9190,7 +9190,7 @@@ F:      drivers/media/platform/rcar-fcp.
  F:    include/media/rcar-fcp.h
  
  MEDIA DRIVERS FOR RENESAS - FDP1
- M:    Kieran Bingham <kieran@bingham.xyz>
+ M:    Kieran Bingham <kieran[email protected]>
  L:    [email protected]
  L:    [email protected]
  T:    git git://linuxtv.org/media_tree.git
@@@ -9186,6 -9210,7 +9210,7 @@@ F:      drivers/media/platform/rcar-vin
  
  MEDIA DRIVERS FOR RENESAS - VSP1
  M:    Laurent Pinchart <[email protected]>
+ M:    Kieran Bingham <[email protected]>
  L:    [email protected]
  L:    [email protected]
  T:    git git://linuxtv.org/media_tree.git
@@@ -9194,19 -9219,17 +9219,17 @@@ F:   Documentation/devicetree/bindings/me
  F:    drivers/media/platform/vsp1/
  
  MEDIA DRIVERS FOR ST STV0910 DEMODULATOR ICs
- M:    Daniel Scheller <[email protected]>
  L:    [email protected]
  W:    https://linuxtv.org
  T:    git git://linuxtv.org/media_tree.git
- S:    Maintained
+ S:    Orphan
  F:    drivers/media/dvb-frontends/stv0910*
  
  MEDIA DRIVERS FOR ST STV6111 TUNER ICs
- M:    Daniel Scheller <[email protected]>
  L:    [email protected]
  W:    https://linuxtv.org
  T:    git git://linuxtv.org/media_tree.git
- S:    Maintained
+ S:    Orphan
  F:    drivers/media/dvb-frontends/stv6111*
  
  MEDIA DRIVERS FOR STM32 - DCMI
@@@ -9573,7 -9596,7 +9596,7 @@@ MEN Z069 WATCHDOG DRIVE
  M:    Johannes Thumshirn <[email protected]>
  L:    [email protected]
  S:    Maintained
- F:    drivers/watchdog/menz069_wdt.c
+ F:    drivers/watchdog/menz69_wdt.c
  
  MESON AO CEC DRIVER FOR AMLOGIC SOCS
  M:    Neil Armstrong <[email protected]>
@@@ -9592,14 -9615,20 +9615,20 @@@ T:   git git://git.monstr.eu/linux-2.6-mi
  S:    Supported
  F:    arch/microblaze/
  
- MICROCHIP / ATMEL AT91 SERIAL DRIVER
+ MICROCHIP AT91 SERIAL DRIVER
  M:    Richard Genoud <[email protected]>
  S:    Maintained
  F:    drivers/tty/serial/atmel_serial.c
  F:    drivers/tty/serial/atmel_serial.h
  F:    Documentation/devicetree/bindings/mfd/atmel-usart.txt
  
- MICROCHIP / ATMEL DMA DRIVER
+ MICROCHIP AUDIO ASOC DRIVERS
+ M:    Codrin Ciubotariu <[email protected]>
+ L:    [email protected] (moderated for non-subscribers)
+ S:    Supported
+ F:    sound/soc/atmel
+ 
+ MICROCHIP DMA DRIVER
  M:    Ludovic Desroches <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  L:    [email protected]
@@@ -9607,27 -9636,35 +9636,35 @@@ S:   Supporte
  F:    drivers/dma/at_hdmac.c
  F:    drivers/dma/at_hdmac_regs.h
  F:    include/linux/platform_data/dma-atmel.h
+ F:    Documentation/devicetree/bindings/dma/atmel-dma.txt
+ F:    include/dt-bindings/dma/at91.h
  
- MICROCHIP / ATMEL ECC DRIVER
+ MICROCHIP ECC DRIVER
  M:    Tudor Ambarus <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    drivers/crypto/atmel-ecc.*
  
- MICROCHIP / ATMEL ISC DRIVER
- M:    Songjun Wu <[email protected]>
+ MICROCHIP I2C DRIVER
+ M:    Ludovic Desroches <[email protected]>
+ L:    [email protected]
+ S:    Supported
+ F:    drivers/i2c/busses/i2c-at91.c
+ 
+ MICROCHIP ISC DRIVER
+ M:    Eugen Hristev <[email protected]>
  L:    [email protected]
  S:    Supported
  F:    drivers/media/platform/atmel/atmel-isc.c
  F:    drivers/media/platform/atmel/atmel-isc-regs.h
  F:    devicetree/bindings/media/atmel-isc.txt
  
- MICROCHIP / ATMEL NAND DRIVER
- M:    Josh Wu <rainyfeeling@outlook.com>
- L:    linux-m[email protected].org
+ MICROCHIP ISI DRIVER
+ M:    Eugen Hristev <eugen.hristev@microchip.com>
+ L:    linux-m[email protected].org
  S:    Supported
- F:    drivers/mtd/nand/raw/atmel/*
- F:    Documentation/devicetree/bindings/mtd/atmel-nand.txt
+ F:    drivers/media/platform/atmel/atmel-isi.c
+ F:    include/media/atmel-isi.h
  
  MICROCHIP AT91 USART MFD DRIVER
  M:    Radu Pirea <[email protected]>
@@@ -9661,6 -9698,80 +9698,80 @@@ L:    [email protected]
  S:    Maintained
  F:    drivers/net/ethernet/microchip/lan743x_*
  
+ MICROCHIP LCDFB DRIVER
+ M:    Nicolas Ferre <[email protected]>
+ L:    [email protected]
+ S:    Maintained
+ F:    drivers/video/fbdev/atmel_lcdfb.c
+ F:    include/video/atmel_lcdc.h
+ 
+ MICROCHIP MMC/SD/SDIO MCI DRIVER
+ M:    Ludovic Desroches <[email protected]>
+ S:    Maintained
+ F:    drivers/mmc/host/atmel-mci.c
+ 
+ MICROCHIP MCP3911 ADC DRIVER
+ M:    Marcus Folkesson <[email protected]>
+ M:    Kent Gustavsson <[email protected]>
+ L:    [email protected]
+ S:    Supported
+ F:    drivers/iio/adc/mcp3911.c
+ F:    Documentation/devicetree/bindings/iio/adc/mcp3911.txt
+ 
+ MICROCHIP NAND DRIVER
+ M:    Tudor Ambarus <[email protected]>
+ L:    [email protected]
+ S:    Supported
+ F:    drivers/mtd/nand/raw/atmel/*
+ F:    Documentation/devicetree/bindings/mtd/atmel-nand.txt
+ 
+ MICROCHIP PWM DRIVER
+ M:    Claudiu Beznea <[email protected]>
+ L:    [email protected] (moderated for non-subscribers)
+ L:    [email protected]
+ S:    Supported
+ F:    drivers/pwm/pwm-atmel.c
+ F:    Documentation/devicetree/bindings/pwm/atmel-pwm.txt
+ 
+ MICROCHIP SAMA5D2-COMPATIBLE ADC DRIVER
+ M:    Ludovic Desroches <[email protected]>
+ M:    Eugen Hristev <[email protected]>
+ L:    [email protected]
+ S:    Supported
+ F:    drivers/iio/adc/at91-sama5d2_adc.c
+ F:    Documentation/devicetree/bindings/iio/adc/at91-sama5d2_adc.txt
+ F:    include/dt-bindings/iio/adc/at91-sama5d2_adc.h
+ 
+ MICROCHIP SAMA5D2-COMPATIBLE SHUTDOWN CONTROLLER
+ M:    Nicolas Ferre <[email protected]>
+ S:    Supported
+ F:    drivers/power/reset/at91-sama5d2_shdwc.c
+ 
+ MICROCHIP SPI DRIVER
+ M:    Nicolas Ferre <[email protected]>
+ S:    Supported
+ F:    drivers/spi/spi-atmel.*
+ 
+ MICROCHIP SSC DRIVER
+ M:    Nicolas Ferre <[email protected]>
+ L:    [email protected] (moderated for non-subscribers)
+ S:    Supported
+ F:    drivers/misc/atmel-ssc.c
+ F:    include/linux/atmel-ssc.h
+ 
+ MICROCHIP TIMER COUNTER (TC) AND CLOCKSOURCE DRIVERS
+ M:    Nicolas Ferre <[email protected]>
+ L:    [email protected] (moderated for non-subscribers)
+ S:    Supported
+ F:    drivers/misc/atmel_tclib.c
+ F:    drivers/clocksource/tcb_clksrc.c
+ 
+ MICROCHIP USBA UDC DRIVER
+ M:    Cristian Birsan <[email protected]>
+ L:    [email protected] (moderated for non-subscribers)
+ S:    Supported
+ F:    drivers/usb/gadget/udc/atmel_usba_udc.*
+ 
  MICROCHIP USB251XB DRIVER
  M:    Richard Leitner <[email protected]>
  L:    [email protected]
@@@ -9668,6 -9779,13 +9779,13 @@@ S:    Maintaine
  F:    drivers/usb/misc/usb251xb.c
  F:    Documentation/devicetree/bindings/usb/usb251xb.txt
  
+ MICROCHIP XDMA DRIVER
+ M:    Ludovic Desroches <[email protected]>
+ L:    [email protected]
+ L:    [email protected]
+ S:    Supported
+ F:    drivers/dma/at_xdmac.c
+ 
  MICROSEMI MIPS SOCS
  M:    Alexandre Belloni <[email protected]>
  L:    [email protected]
@@@ -10006,9 -10124,19 +10124,19 @@@ F: drivers/media/tuners/mxl5007t.
  
  MXSFB DRM DRIVER
  M:    Marek Vasut <[email protected]>
+ M:    Stefan Agner <[email protected]>
+ L:    [email protected]
  S:    Supported
  F:    drivers/gpu/drm/mxsfb/
  F:    Documentation/devicetree/bindings/display/mxsfb.txt
+ T:    git git://anongit.freedesktop.org/drm/drm-misc
+ 
+ MYLEX DAC960 PCI RAID Controller
+ M:    Hannes Reinecke <[email protected]>
+ L:    [email protected]
+ S:    Supported
+ F:    drivers/scsi/myrb.*
+ F:    drivers/scsi/myrs.*
  
  MYRICOM MYRI-10G 10GbE DRIVER (MYRI10GE)
  M:    Chris Lee <[email protected]>
@@@ -10041,11 -10169,6 +10169,6 @@@ NATSEMI ETHERNET DRIVER (DP8381x
  S:    Orphan
  F:    drivers/net/ethernet/natsemi/natsemi.c
  
- NCP FILESYSTEM
- M:    Petr Vandrovec <[email protected]>
- S:    Obsolete
- F:    drivers/staging/ncpfs/
- 
  NCR 5380 SCSI DRIVERS
  M:    Finn Thain <[email protected]>
  M:    Michael Schmitz <[email protected]>
@@@ -11146,7 -11269,7 +11269,7 @@@ S:   Maintaine
  F:    drivers/firmware/pcdp.*
  
  PCI DRIVER FOR AARDVARK (Marvell Armada 3700)
- M:    Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+ M:    Thomas Petazzoni <thomas.petazzoni@bootlin.com>
  L:    [email protected]
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
@@@ -11178,7 -11301,7 +11301,7 @@@ F:   Documentation/devicetree/bindings/pc
  F:    drivers/pci/controller/pci-versatile.c
  
  PCI DRIVER FOR ARMADA 8K
- M:    Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+ M:    Thomas Petazzoni <thomas.petazzoni@bootlin.com>
  L:    [email protected]
  L:    [email protected]
  S:    Maintained
@@@ -11247,7 -11370,7 +11370,7 @@@ F:   Documentation/devicetree/bindings/pc
  F:    drivers/pci/controller/pcie-mobiveil.c
  
  PCI DRIVER FOR MVEBU (Marvell Armada 370 and Armada XP SOC support)
- M:    Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+ M:    Thomas Petazzoni <thomas.petazzoni@bootlin.com>
  M:    Jason Cooper <[email protected]>
  L:    [email protected]
  L:    [email protected] (moderated for non-subscribers)
@@@ -11298,7 -11421,7 +11421,7 @@@ M:   Murali Karicheri <[email protected]
  L:    [email protected]
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
- F:    drivers/pci/controller/dwc/*keystone*
+ F:    drivers/pci/controller/dwc/pci-keystone.c
  
  PCI ENDPOINT SUBSYSTEM
  M:    Kishon Vijay Abraham I <[email protected]>
@@@ -12513,6 -12636,12 +12636,12 @@@ S: Supporte
  F:    drivers/i2c/busses/i2c-rcar.c
  F:    drivers/i2c/busses/i2c-sh_mobile.c
  
+ RENESAS RIIC DRIVER
+ M:    Chris Brandt <[email protected]>
+ S:    Supported
+ F:    Documentation/devicetree/bindings/i2c/i2c-riic.txt
+ F:    drivers/i2c/busses/i2c-riic.c
+ 
  RENESAS USB PHY DRIVER
  M:    Yoshihiro Shimoda <[email protected]>
  L:    [email protected]
@@@ -12799,6 -12928,18 +12928,18 @@@ W: http://www.ibm.com/developerworks/li
  S:    Supported
  F:    drivers/s390/crypto/
  
+ S390 VFIO AP DRIVER
+ M:    Tony Krowiak <[email protected]>
+ M:    Pierre Morel <[email protected]>
+ M:    Halil Pasic <[email protected]>
+ L:    [email protected]
+ W:    http://www.ibm.com/developerworks/linux/linux390/
+ S:    Supported
+ F:    drivers/s390/crypto/vfio_ap_drv.c
+ F:    drivers/s390/crypto/vfio_ap_private.h
+ F:    drivers/s390/crypto/vfio_ap_ops.c
+ F:    Documentation/s390/vfio-ap.txt
+ 
  S390 ZFCP DRIVER
  M:    Steffen Maier <[email protected]>
  M:    Benjamin Block <[email protected]>
@@@ -13140,6 -13281,12 +13281,12 @@@ L: [email protected]
  S:    Maintained
  F:    drivers/mmc/host/sdhci-pci-dwc-mshc.c
  
+ SECURE DIGITAL HOST CONTROLLER INTERFACE (SDHCI) MICROCHIP DRIVER
+ M:    Ludovic Desroches <[email protected]>
+ L:    [email protected]
+ S:    Supported
+ F:    drivers/mmc/host/sdhci-of-at91.c
+ 
  SECURE DIGITAL HOST CONTROLLER INTERFACE (SDHCI) SAMSUNG DRIVER
  M:    Ben Dooks <[email protected]>
  M:    Jaehoon Chung <[email protected]>
@@@ -13678,6 -13825,20 +13825,20 @@@ S: Maintaine
  F:    drivers/media/i2c/imx274.c
  F:    Documentation/devicetree/bindings/media/i2c/imx274.txt
  
+ SONY IMX319 SENSOR DRIVER
+ M:    Bingbu Cao <[email protected]>
+ L:    [email protected]
+ T:    git git://linuxtv.org/media_tree.git
+ S:    Maintained
+ F:    drivers/media/i2c/imx319.c
+ 
+ SONY IMX355 SENSOR DRIVER
+ M:    Tianshu Qiu <[email protected]>
+ L:    [email protected]
+ T:    git git://linuxtv.org/media_tree.git
+ S:    Maintained
+ F:    drivers/media/i2c/imx355.c
+ 
  SONY MEMORYSTICK CARD SUPPORT
  M:    Alex Dubov <[email protected]>
  W:    http://tifmxx.berlios.de/
@@@ -13744,7 -13905,7 +13905,7 @@@ F:   sound/soc
  F:    include/sound/soc*
  
  SOUNDWIRE SUBSYSTEM
- M:    Vinod Koul <v[email protected]>
+ M:    Vinod Koul <v[email protected]>
  M:    Sanyog Kale <[email protected]>
  R:    Pierre-Louis Bossart <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
@@@ -13880,6 -14041,13 +14041,13 @@@ L: [email protected]
  S:    Maintained
  F:    drivers/i2c/busses/i2c-stm32*
  
+ ST VL53L0X ToF RANGER(I2C) IIO DRIVER
+ M:    Song Qiang <[email protected]>
+ L:    [email protected]
+ S:    Maintained
+ F:    drivers/iio/proximity/vl53l0x-i2c.c
+ F:    Documentation/devicetree/bindings/iio/proximity/vl53l0x.txt
+ 
  STABLE BRANCH
  M:    Greg Kroah-Hartman <[email protected]>
  L:    [email protected]
@@@ -13899,11 -14067,6 +14067,6 @@@ L:  [email protected]
  S:    Maintained
  F:    drivers/staging/erofs/
  
- STAGING - FLARION FT1000 DRIVERS
- M:    Marek Belisko <[email protected]>
- S:    Odd Fixes
- F:    drivers/staging/ft1000/
- 
  STAGING - INDUSTRIAL IO
  M:    Jonathan Cameron <[email protected]>
  L:    [email protected]
@@@ -13995,7 -14158,7 +14158,7 @@@ F:   sound/soc/sti
  STI CEC DRIVER
  M:    Benjamin Gaignard <[email protected]>
  S:    Maintained
- F:    drivers/staging/media/st-cec/
+ F:    drivers/media/platform/sti/cec/
  F:    Documentation/devicetree/bindings/media/stih-cec.txt
  
  STK1160 USB VIDEO CAPTURE DRIVER
@@@ -14547,7 -14710,6 +14710,6 @@@ F:   Documentation/devicetree/bindings/ar
  F:    drivers/firmware/ti_sci*
  F:    include/linux/soc/ti/ti_sci_protocol.h
  F:    Documentation/devicetree/bindings/soc/ti/sci-pm-domain.txt
- F:    include/dt-bindings/genpd/k2g.h
  F:    drivers/soc/ti/ti_sci_pm_domains.c
  F:    Documentation/devicetree/bindings/reset/ti,sci-reset.txt
  F:    Documentation/devicetree/bindings/clock/ti,sci-clk.txt
@@@ -14751,6 -14913,13 +14913,13 @@@ L: [email protected]
  S:    Maintained
  F:    drivers/net/ethernet/ti/netcp*
  
+ TI PCM3060 ASoC CODEC DRIVER
+ M:    Kirill Marinushkin <[email protected]>
+ L:    [email protected] (moderated for non-subscribers)
+ S:    Maintained
+ F:    Documentation/devicetree/bindings/sound/pcm3060.txt
+ F:    sound/soc/codecs/pcm3060*
+ 
  TI TAS571X FAMILY ASoC CODEC DRIVER
  M:    Kevin Cernekee <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
@@@ -15254,9 -15423,9 +15423,9 @@@ F:   include/linux/usb/gadget
  
  USB HID/HIDBP DRIVERS (USB KEYBOARDS, MICE, REMOTE CONTROLS, ...)
  M:    Jiri Kosina <[email protected]>
 -R:    Benjamin Tissoires <[email protected]>
 +M:    Benjamin Tissoires <[email protected]>
  L:    [email protected]
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/hid/hid.git
  S:    Maintained
  F:    Documentation/hid/hiddev.txt
  F:    drivers/hid/usbhid/
@@@ -15423,6 -15592,12 +15592,12 @@@ F: Documentation/driver-api/usb/typec_b
  F:    drivers/usb/typec/altmodes/
  F:    include/linux/usb/typec_altmode.h
  
+ USB TYPEC PORT CONTROLLER DRIVERS
+ M:    Guenter Roeck <[email protected]>
+ L:    [email protected]
+ S:    Maintained
+ F:    drivers/usb/typec/tcpm/
+ 
  USB UHCI DRIVER
  M:    Alan Stern <[email protected]>
  L:    [email protected]
@@@ -15497,13 -15672,27 +15672,27 @@@ F:        arch/x86/um
  F:    fs/hostfs/
  F:    fs/hppfs/
  
+ USERSPACE COPYIN/COPYOUT (UIOVEC)
+ M:    Alexander Viro <[email protected]>
+ S:    Maintained
+ F:    lib/iov_iter.c
+ F:    include/linux/uio.h
+ 
+ USERSPACE DMA BUFFER DRIVER
+ M:    Gerd Hoffmann <[email protected]>
+ S:    Maintained
+ L:    [email protected]
+ F:    drivers/dma-buf/udmabuf.c
+ F:    include/uapi/linux/udmabuf.h
+ T:    git git://anongit.freedesktop.org/drm/drm-misc
+ 
  USERSPACE I/O (UIO)
  M:    Greg Kroah-Hartman <[email protected]>
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git
  F:    Documentation/driver-api/uio-howto.rst
  F:    drivers/uio/
- F:    include/linux/uio*.h
+ F:    include/linux/uio_driver.h
  
  UTIL-LINUX PACKAGE
  M:    Karel Zak <[email protected]>
@@@ -15627,7 -15816,7 +15816,7 @@@ M:   Marek Szyprowski <m.szyprowski@samsu
  M:    Kyungmin Park <[email protected]>
  L:    [email protected]
  S:    Maintained
- F:    drivers/media/v4l2-core/videobuf2-*
+ F:    drivers/media/common/videobuf2/*
  F:    include/media/videobuf2-*
  
  VIMC VIRTUAL MEDIA CONTROLLER DRIVER
@@@ -16104,6 -16293,17 +16293,17 @@@ T: git git://git.kernel.org/pub/scm/lin
  S:    Maintained
  F:    arch/x86/entry/vdso/
  
+ XARRAY
+ M:    Matthew Wilcox <[email protected]>
+ L:    [email protected]
+ S:    Supported
+ F:    Documentation/core-api/xarray.rst
+ F:    lib/idr.c
+ F:    lib/xarray.c
+ F:    include/linux/idr.h
+ F:    include/linux/xarray.h
+ F:    tools/testing/radix-tree
+ 
  XC2028/3028 TUNER DRIVER
  M:    Mauro Carvalho Chehab <[email protected]>
  L:    [email protected]
@@@ -16145,6 -16345,7 +16345,7 @@@ F:   arch/arm64/include/asm/xen
  XEN HYPERVISOR INTERFACE
  M:    Boris Ostrovsky <[email protected]>
  M:    Juergen Gross <[email protected]>
+ R:    Stefano Stabellini <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip.git
  S:    Supported

diff --combined drivers/hid/i2c-hid/i2c-hid-dmi-quirks.c
index 9ca2fcc48b5a5635f34e03c04d1a35fae075da10,cac262a912c1248747d2814fa9e3b3d3512f8c76..89f2976f9c534c475da40c3933d2775e46787ae9
--- 1/drivers/hid/i2c-hid/i2c-hid-dmi-quirks.c
--- 2/drivers/hid/i2c-hid/i2c-hid-dmi-quirks.c
+++ b/drivers/hid/i2c-hid/i2c-hid-dmi-quirks.c
@@@ -330,14 -330,6 +330,14 @@@ static const struct dmi_system_id i2c_h
                },
                .driver_data = (void *)&sipodev_desc
        },
 +      {
 +              .ident = "Direkt-Tek DTLAPY133-1",
 +              .matches = {
 +                      DMI_EXACT_MATCH(DMI_SYS_VENDOR, "Direkt-Tek"),
 +                      DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "DTLAPY133-1"),
 +              },
 +              .driver_data = (void *)&sipodev_desc
 +      },
        {
                .ident = "Mediacom Flexbook Edge 11",
                .matches = {
@@@ -345,7 -337,8 +345,8 @@@
                        DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "FlexBook edge11 - M-FBE11"),
                },
                .driver_data = (void *)&sipodev_desc
-       }
+       },
+       { }     /* Terminate list */
  };