Merge tag 'staging-5.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh...

Pull staging and IIO driver updates from Greg KH:
 "Here is the big staging/iio driver update for 5.4-rc1.

  Lots of churn here, with a few driver/filesystems moving out of
  staging finally:

     - erofs moved out of staging

     - greybus core code moved out of staging

  Along with that, a new filesytem has been added:

     - extfat

  to provide support for those devices requiring that filesystem (i.e.
  transfer devices to/from windows systems or printers)

  Other than that, there a number of new IIO drivers, and lots and lots
  and lots of staging driver cleanups and minor fixes as people continue
  to dig into those for easy changes.

  All of these have been in linux-next for a while with no reported
  issues"

* tag 'staging-5.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (453 commits)
  Staging: gasket: Use temporaries to reduce line length.
  Staging: octeon: Avoid several usecases of strcpy
  staging: vhciq_core: replace snprintf with scnprintf
  staging: wilc1000: avoid twice IRQ handler execution for each single interrupt
  staging: wilc1000: remove unused interrupt status handling code
  staging: fbtft: make several arrays static const, makes object smaller
  staging: rtl8188eu: make two arrays static const, makes object smaller
  staging: rtl8723bs: core: Remove Macro "IS_MAC_ADDRESS_BROADCAST"
  dt-bindings: anybus-controller: move to staging/ tree
  staging: emxx_udc: remove local TRUE/FALSE definition
  staging: wilc1000: look for rtc_clk clock
  staging: dt-bindings: wilc1000: add optional rtc_clk property
  staging: nvec: make use of devm_platform_ioremap_resource
  staging: exfat: drop unused function parameter
  Staging: exfat: Avoid use of strcpy
  staging: exfat: use integer constants
  staging: exfat: cleanup spacing for casts
  staging: exfat: cleanup spacing for operators
  staging: rtl8723bs: hal: remove redundant variable n
  staging: pi433: Fix typo in documentation
  ...

diff --combined Documentation/devicetree/bindings/vendor-prefixes.yaml
index de4240e0aa82fb93a7cdb444798ff5a4e06aa113,30e222193164af81839e9da69e71ddb757d35d06..329b668dac0a4c58e37157d54dc37f9dadc5d6d9
--- 1/Documentation/devicetree/bindings/vendor-prefixes.yaml
--- 2/Documentation/devicetree/bindings/vendor-prefixes.yaml
+++ b/Documentation/devicetree/bindings/vendor-prefixes.yaml
@@@ -27,8 -27,6 +27,8 @@@ patternProperties
      description: Abilis Systems
    "^abracon,.*":
      description: Abracon Corporation
 +  "^acme,.*":
 +    description: Acme Systems srl
    "^actions,.*":
      description: Actions Semiconductor Co., Ltd.
    "^active-semi,.*":
@@@ -83,8 -81,6 +83,8 @@@
      description: Analogix Semiconductor, Inc.
    "^andestech,.*":
      description: Andes Technology Corporation
 +  "^anvo,.*":
 +    description: Anvo-Systems Dresden GmbH
    "^apm,.*":
      description: Applied Micro Circuits Corporation (APM)
    "^aptina,.*":
@@@ -273,8 -269,6 +273,8 @@@
      description: Emerging Display Technologies
    "^eeti,.*":
      description: eGalax_eMPIA Technology Inc
 +  "^einfochips,.*":
 +    description: Einfochips
    "^elan,.*":
      description: Elan Microelectronic Corp.
    "^elgin,.*":
@@@ -509,8 -503,6 +509,8 @@@
      description: Lantiq Semiconductor
    "^lattice,.*":
      description: Lattice Semiconductor
 +  "^leez,.*":
 +    description: Leez
    "^lego,.*":
      description: LEGO Systems A/S
    "^lemaker,.*":
@@@ -537,8 -529,6 +537,8 @@@
      description: Linear Technology Corporation
    "^logicpd,.*":
      description: Logic PD, Inc.
 +  "^longcheer,.*":
 +    description: Longcheer Technology (Shanghai) Co., Ltd.
    "^lsi,.*":
      description: LSI Corp. (LSI Logic)
    "^lwn,.*":
@@@ -559,8 -549,6 +559,8 @@@
      description: mCube
    "^meas,.*":
      description: Measurement Specialties
 +  "^mecer,.*":
 +    description: Mustek Limited
    "^mediatek,.*":
      description: MediaTek Inc.
    "^megachips,.*":
@@@ -587,8 -575,6 +587,8 @@@
      description: Micro Crystal AG
    "^micron,.*":
      description: Micron Technology Inc.
 +  "^microsoft,.*":
 +    description: Microsoft Corporation
    "^mikroe,.*":
      description: MikroElektronika d.o.o.
    "^miniand,.*":
@@@ -827,6 -813,8 +827,8 @@@
      description: Semtech Corporation
    "^sensirion,.*":
      description: Sensirion AG
+   "^sensortek,.*":
+     description: Sensortek Technology Corporation
    "^sff,.*":
      description: Small Form Factor Committee
    "^sgd,.*":

diff --combined MAINTAINERS
index 0e01ab35df0426de22b73d480c0f4b3ba7485b64,8c71957ca9d8281214489f3e4c57cc3edde85644..0262f99df61d4162c6a09c30aeea70027a8b6fdf
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -183,7 -183,7 +183,7 @@@ M: Realtek linux nic maintainers <nic_s
  M:    Heiner Kallweit <[email protected]>
  L:    [email protected]
  S:    Maintained
 -F:    drivers/net/ethernet/realtek/r8169.c
 +F:    drivers/net/ethernet/realtek/r8169*
  
  8250/16?50 (AND CLONE UARTS) SERIAL DRIVER
  M:    Greg Kroah-Hartman <[email protected]>
@@@ -517,6 -517,14 +517,6 @@@ W:        http://ez.analog.com/community/linux
  S:    Supported
  F:    drivers/video/backlight/adp8860_bl.c
  
 -ADS1015 HARDWARE MONITOR DRIVER
 -M:    Dirk Eibach <[email protected]>
 -L:    [email protected]
 -S:    Maintained
 -F:    Documentation/hwmon/ads1015.rst
 -F:    drivers/hwmon/ads1015.c
 -F:    include/linux/platform_data/ads1015.h
 -
  ADT746X FAN DRIVER
  M:    Colin Leroy <[email protected]>
  S:    Maintained
@@@ -658,7 -666,7 +658,7 @@@ ALI1563 I2C DRIVE
  M:    Rudolf Marek <[email protected]>
  L:    [email protected]
  S:    Maintained
 -F:    Documentation/i2c/busses/i2c-ali1563
 +F:    Documentation/i2c/busses/i2c-ali1563.rst
  F:    drivers/i2c/busses/i2c-ali1563.c
  
  ALLEGRO DVT VIDEO IP CORE DRIVER
@@@ -668,13 -676,6 +668,13 @@@ L:       [email protected]
  S:    Maintained
  F:    drivers/staging/media/allegro-dvt/
  
 +ALLWINNER CPUFREQ DRIVER
 +M:    Yangtao Li <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/opp/sun50i-nvmem-cpufreq.txt
 +F:    drivers/cpufreq/sun50i-cpufreq-nvmem.c
 +
  ALLWINNER SECURITY SYSTEM
  M:    Corentin Labbe <[email protected]>
  L:    [email protected]
@@@ -682,7 -683,7 +682,7 @@@ S: Maintaine
  F:    drivers/crypto/sunxi-ss/
  
  ALLWINNER VPU DRIVER
 -M:    Maxime Ripard <m[email protected]>
 +M:    Maxime Ripard <m[email protected]>
  M:    Paul Kocialkowski <[email protected]>
  L:    [email protected]
  S:    Maintained
@@@ -902,11 -903,12 +902,12 @@@ F:      Documentation/devicetree/bindings/ii
  
  ANALOG DEVICES INC AD7606 DRIVER
  M:    Stefan Popa <[email protected]>
+ M:    Beniamin Bia <[email protected]>
  L:    [email protected]
  W:    http://ez.analog.com/community/linux-device-drivers
  S:    Supported
  F:    drivers/iio/adc/ad7606.c
- F:    Documentation/devicetree/bindings/iio/adc/adi,ad7606.txt
+ F:    Documentation/devicetree/bindings/iio/adc/adi,ad7606.yaml
  
  ANALOG DEVICES INC AD7768-1 DRIVER
  M:    Stefan Popa <[email protected]>
@@@ -944,6 -946,14 +945,14 @@@ L:       [email protected]
  F:    include/linux/iio/imu/adis.h
  F:    drivers/iio/imu/adis.c
  
+ ANALOG DEVICES INC ADIS16460 DRIVER
+ M:    Dragos Bogdan <[email protected]>
+ S:    Supported
+ L:    [email protected]
+ W:    http://ez.analog.com/community/linux-device-drivers
+ F:    drivers/iio/imu/adis16460.c
+ F:    Documentation/devicetree/bindings/iio/imu/adi,adis16460.yaml
+ 
  ANALOG DEVICES INC ADP5061 DRIVER
  M:    Stefan Popa <[email protected]>
  L:    [email protected]
@@@ -1349,7 -1359,8 +1358,7 @@@ M:      Will Deacon <[email protected]
  R:    Robin Murphy <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
 -F:    drivers/iommu/arm-smmu.c
 -F:    drivers/iommu/arm-smmu-v3.c
 +F:    drivers/iommu/arm-smmu*
  F:    drivers/iommu/io-pgtable-arm.c
  F:    drivers/iommu/io-pgtable-arm-v7s.c
  
@@@ -1406,7 -1417,7 +1415,7 @@@ S:      Maintaine
  F:    drivers/clk/sunxi/
  
  ARM/Allwinner sunXi SoC support
 -M:    Maxime Ripard <m[email protected]>
 +M:    Maxime Ripard <m[email protected]>
  M:    Chen-Yu Tsai <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
@@@ -1419,14 -1430,6 +1428,14 @@@ F:    drivers/pinctrl/sunxi
  F:    drivers/soc/sunxi/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux.git
  
 +Allwinner A10 CSI driver
 +M:    Maxime Ripard <[email protected]>
 +L:    [email protected]
 +T:    git git://linuxtv.org/media_tree.git
 +F:    drivers/media/platform/sunxi/sun4i-csi/
 +F:    Documentation/devicetree/bindings/media/allwinner,sun4i-a10-csi.yaml
 +S:    Maintained
 +
  ARM/Amlogic Meson SoC CLOCK FRAMEWORK
  M:    Neil Armstrong <[email protected]>
  M:    Jerome Brunet <[email protected]>
@@@ -1477,7 -1480,6 +1486,7 @@@ F:      arch/arm/mach-artpe
  F:    arch/arm/boot/dts/artpec6*
  F:    drivers/clk/axis
  F:    drivers/crypto/axis
 +F:    drivers/mmc/host/usdhi6rol0.c
  F:    drivers/pinctrl/pinctrl-artpec*
  F:    Documentation/devicetree/bindings/pinctrl/axis,artpec6-pinctrl.txt
  
@@@ -1589,8 -1591,8 +1598,8 @@@ R:      Suzuki K Poulose <suzuki.poulose@arm
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
  F:    drivers/hwtracing/coresight/*
 -F:    Documentation/trace/coresight.txt
 -F:    Documentation/trace/coresight-cpu-debug.txt
 +F:    Documentation/trace/coresight.rst
 +F:    Documentation/trace/coresight-cpu-debug.rst
  F:    Documentation/devicetree/bindings/arm/coresight.txt
  F:    Documentation/devicetree/bindings/arm/coresight-cpu-debug.txt
  F:    Documentation/ABI/testing/sysfs-bus-coresight-devices-*
@@@ -1633,21 -1635,6 +1642,21 @@@ F:    drivers/clocksource/timer-atlas7.
  N:    [^a-z]sirf
  X:    drivers/gnss
  
 +ARM/CZ.NIC TURRIS MOX SUPPORT
 +M:    Marek Behun <[email protected]>
 +W:    http://mox.turris.cz
 +S:    Maintained
 +F:    Documentation/ABI/testing/debugfs-moxtet
 +F:    Documentation/ABI/testing/sysfs-bus-moxtet-devices
 +F:    Documentation/ABI/testing/sysfs-firmware-turris-mox-rwtm
 +F:    Documentation/devicetree/bindings/bus/moxtet.txt
 +F:    Documentation/devicetree/bindings/firmware/cznic,turris-mox-rwtm.txt
 +F:    Documentation/devicetree/bindings/gpio/gpio-moxtet.txt
 +F:    include/linux/moxtet.h
 +F:    drivers/bus/moxtet.c
 +F:    drivers/firmware/turris-mox-rwtm.c
 +F:    drivers/gpio/gpio-moxtet.c
 +
  ARM/EBSA110 MACHINE SUPPORT
  M:    Russell King <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
@@@ -1771,11 -1758,20 +1780,11 @@@ L:   [email protected]
  S:    Maintained
  F:    arch/arm/mach-pxa/colibri-pxa270-income.c
  
 -ARM/INTEL IOP13XX ARM ARCHITECTURE
 -M:    Lennert Buytenhek <[email protected]>
 -L:    [email protected] (moderated for non-subscribers)
 -S:    Maintained
 -
  ARM/INTEL IOP32X ARM ARCHITECTURE
  M:    Lennert Buytenhek <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
  
 -ARM/INTEL IOP33X ARM ARCHITECTURE
 -L:    [email protected] (moderated for non-subscribers)
 -S:    Orphan
 -
  ARM/INTEL IQ81342EX MACHINE SUPPORT
  M:    Lennert Buytenhek <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
@@@ -1934,6 -1930,12 +1943,6 @@@ S:     Maintaine
  F:    drivers/phy/mediatek/
  F:    Documentation/devicetree/bindings/phy/phy-mtk-*
  
 -ARM/MICREL KS8695 ARCHITECTURE
 -M:    Greg Ungerer <[email protected]>
 -L:    [email protected] (moderated for non-subscribers)
 -F:    arch/arm/mach-ks8695/
 -S:    Odd Fixes
 -
  ARM/Microchip (AT91) SoC support
  M:    Nicolas Ferre <[email protected]>
  M:    Alexandre Belloni <[email protected]>
@@@ -1975,7 -1977,6 +1984,7 @@@ F:      Documentation/devicetree/bindings/i2
  F:    arch/arm/mach-nomadik/
  F:    arch/arm/mach-u300/
  F:    arch/arm/mach-ux500/
 +F:    drivers/soc/ux500/
  F:    arch/arm/boot/dts/ste-*
  F:    drivers/clk/clk-nomadik.c
  F:    drivers/clk/clk-u300.c
@@@ -2019,6 -2020,22 +2028,6 @@@ F:     drivers/*/*npcm
  F:    Documentation/devicetree/bindings/*/*npcm*
  F:    Documentation/devicetree/bindings/*/*/*npcm*
  
 -ARM/NUVOTON W90X900 ARM ARCHITECTURE
 -M:    Wan ZongShun <[email protected]>
 -L:    [email protected] (moderated for non-subscribers)
 -W:    http://www.mcuos.com
 -S:    Maintained
 -F:    arch/arm/mach-w90x900/
 -F:    drivers/input/keyboard/w90p910_keypad.c
 -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/raw/nuc900_nand.c
 -F:    drivers/rtc/rtc-nuc900.c
 -F:    drivers/spi/spi-nuc900.c
 -F:    drivers/usb/host/ehci-w90x900.c
 -F:    drivers/video/fbdev/nuc900fb.c
 -
  ARM/OPENMOKO NEO FREERUNNER (GTA02) MACHINE SUPPORT
  L:    [email protected] (subscribers-only)
  W:    http://wiki.openmoko.org/wiki/Neo_FreeRunner
@@@ -2211,9 -2228,8 +2220,9 @@@ F:      drivers/*/*s3c24
  F:    drivers/*/*/*s3c24*
  F:    drivers/*/*s3c64xx*
  F:    drivers/*/*s5pv210*
 -F:    drivers/memory/samsung/*
 -F:    drivers/soc/samsung/*
 +F:    drivers/memory/samsung/
 +F:    drivers/soc/samsung/
 +F:    include/linux/soc/samsung/
  F:    Documentation/arm/samsung/
  F:    Documentation/devicetree/bindings/arm/samsung/
  F:    Documentation/devicetree/bindings/sram/samsung-sram.txt
@@@ -3570,7 -3586,7 +3579,7 @@@ F:      Documentation/filesystems/caching/ca
  F:    fs/cachefiles/
  
  CADENCE MIPI-CSI2 BRIDGES
 -M:    Maxime Ripard <m[email protected]>
 +M:    Maxime Ripard <m[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    Documentation/devicetree/bindings/media/cdns,*.txt
@@@ -3797,9 -3813,14 +3806,9 @@@ F:     scripts/sign-file.
  F:    scripts/extract-cert.c
  
  CERTIFIED WIRELESS USB (WUSB) SUBSYSTEM:
 -L:    [email protected]
 -S:    Orphan
 -F:    Documentation/usb/wusb-design-overview.rst
 -F:    Documentation/usb/wusb-cbaf
 -F:    drivers/usb/host/hwa-hc.c
 -F:    drivers/usb/host/whci/
 -F:    drivers/usb/wusbcore/
 -F:    include/linux/usb/wusb*
 +L:    [email protected]
 +S:    Obsolete
 +F:    drivers/staging/wusbcore/
  
  CFAG12864B LCD DRIVER
  M:    Miguel Ojeda Sandonis <[email protected]>
@@@ -4091,7 -4112,7 +4100,7 @@@ L:      [email protected] (mod
  W:    http://linux-cifs.samba.org/
  T:    git git://git.samba.org/sfrench/cifs-2.6.git
  S:    Supported
 -F:    Documentation/filesystems/cifs/
 +F:    Documentation/admin-guide/cifs/
  F:    fs/cifs/
  
  COMPACTPCI HOTPLUG CORE
@@@ -4278,14 -4299,6 +4287,14 @@@ S:    Supporte
  F:    drivers/cpuidle/cpuidle-exynos.c
  F:    arch/arm/mach-exynos/pm.c
  
 +CPUIDLE DRIVER - ARM PSCI
 +M:    Lorenzo Pieralisi <[email protected]>
 +M:    Sudeep Holla <[email protected]>
 +L:    [email protected]
 +L:    [email protected]
 +S:    Supported
 +F:    drivers/cpuidle/cpuidle-psci.c
 +
  CPU IDLE TIME MANAGEMENT FRAMEWORK
  M:    "Rafael J. Wysocki" <[email protected]>
  M:    Daniel Lezcano <[email protected]>
@@@ -4947,9 -4960,7 +4956,9 @@@ M:      Jonathan Corbet <[email protected]
  L:    [email protected]
  S:    Maintained
  F:    Documentation/
 +F:    scripts/documentation-file-ref-check
  F:    scripts/kernel-doc
 +F:    scripts/sphinx-pre-install
  X:    Documentation/ABI/
  X:    Documentation/firmware-guide/acpi/
  X:    Documentation/devicetree/
@@@ -4965,14 -4976,6 +4974,14 @@@ L:    [email protected]
  S:    Maintained
  F:    Documentation/translations/it_IT
  
 +DOCUMENTATION SCRIPTS
 +M:    Mauro Carvalho Chehab <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    scripts/documentation-file-ref-check
 +F:    scripts/sphinx-pre-install
 +F:    Documentation/sphinx/parse-headers.pl
 +
  DONGWOON DW9714 LENS VOICE COIL DRIVER
  M:    Sakari Ailus <[email protected]>
  L:    [email protected]
@@@ -5301,7 -5304,7 +5310,7 @@@ F:      include/linux/vga
  
  DRM DRIVERS AND MISC GPU PATCHES
  M:    Maarten Lankhorst <[email protected]>
 -M:    Maxime Ripard <m[email protected]>
 +M:    Maxime Ripard <m[email protected]>
  M:    Sean Paul <[email protected]>
  W:    https://01.org/linuxgraphics/gfx-docs/maintainer-tools/drm-misc.html
  S:    Maintained
@@@ -5314,7 -5317,7 +5323,7 @@@ F:      include/uapi/drm/drm
  F:    include/linux/vga*
  
  DRM DRIVERS FOR ALLWINNER A10
 -M:    Maxime Ripard  <[email protected]>
 +M:    Maxime Ripard <[email protected]>
  L:    [email protected]
  S:    Supported
  F:    drivers/gpu/drm/sun4i/
@@@ -5767,11 -5770,6 +5776,11 @@@ S:    Supporte
  F:    drivers/edac/aspeed_edac.c
  F:    Documentation/devicetree/bindings/edac/aspeed-sdram-edac.txt
  
 +EDAC-BLUEFIELD
 +M:    Shravan Kumar Ramani <[email protected]>
 +S:    Supported
 +F:    drivers/edac/bluefield_edac.c
 +
  EDAC-CALXEDA
  M:    Robert Richter <[email protected]>
  L:    [email protected]
@@@ -5796,11 -5794,10 +5805,11 @@@ F:   drivers/edac/thunderx_edac
  EDAC-CORE
  M:    Borislav Petkov <[email protected]>
  M:    Mauro Carvalho Chehab <[email protected]>
 +M:    Tony Luck <[email protected]>
  R:    James Morse <[email protected]>
 +R:    Robert Richter <[email protected]>
  L:    [email protected]
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp.git for-next
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-edac.git linux_next
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras.git edac-for-next
  S:    Supported
  F:    Documentation/admin-guide/ras.rst
  F:    Documentation/driver-api/edac.rst
@@@ -6050,6 -6047,13 +6059,13 @@@ T:    git git://git.kernel.org/pub/scm/lin
  F:    drivers/video/fbdev/s1d13xxxfb.c
  F:    include/video/s1d13xxxfb.h
  
+ EROFS FILE SYSTEM
+ M:    Gao Xiang <[email protected]>
+ M:    Chao Yu <[email protected]>
+ L:    [email protected]
+ S:    Maintained
+ F:    fs/erofs/
+ 
  ERRSEQ ERROR TRACKING INFRASTRUCTURE
  M:    Jeff Layton <[email protected]>
  S:    Maintained
@@@ -6077,7 -6081,7 +6093,7 @@@ M:      Florian Fainelli <[email protected]
  M:    Heiner Kallweit <[email protected]>
  L:    [email protected]
  S:    Maintained
 -F:    Documentation/ABI/testing/sysfs-bus-mdio
 +F:    Documentation/ABI/testing/sysfs-class-net-phydev
  F:    Documentation/devicetree/bindings/net/ethernet-phy.yaml
  F:    Documentation/devicetree/bindings/net/mdio*
  F:    Documentation/networking/phy.rst
@@@ -6094,6 -6098,11 +6110,11 @@@ F:    include/trace/events/mdio.
  F:    include/uapi/linux/mdio.h
  F:    include/uapi/linux/mii.h
  
+ EXFAT FILE SYSTEM
+ M:    Valdis Kletnieks <[email protected]>
+ S:    Maintained
+ F:    drivers/staging/exfat/
+ 
  EXT2 FILE SYSTEM
  M:    Jan Kara <[email protected]>
  L:    [email protected]
@@@ -6280,14 -6289,12 +6301,14 @@@ S:   Maintaine
  F:    drivers/hwmon/f75375s.c
  F:    include/linux/f75375s.h
  
 -FIREWIRE AUDIO DRIVERS
 +FIREWIRE AUDIO DRIVERS and IEC 61883-1/6 PACKET STREAMING ENGINE
  M:    Clemens Ladisch <[email protected]>
 +M:    Takashi Sakamoto <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git
  S:    Maintained
  F:    sound/firewire/
 +F:    include/uapi/sound/firewire.h
  
  FIREWIRE MEDIA DRIVERS (firedtv)
  M:    Stefan Richter <[email protected]>
@@@ -6345,6 -6352,15 +6366,6 @@@ S:     Odd Fixe
  L:    [email protected]
  F:    drivers/block/floppy.c
  
 -FMC SUBSYSTEM
 -M:    Alessandro Rubini <[email protected]>
 -W:    http://www.ohwr.org/projects/fmc-bus
 -S:    Supported
 -F:    drivers/fmc/
 -F:    include/linux/fmc*.h
 -F:    include/linux/ipmi-fru.h
 -K:    fmc_d.*register
 -
  FPGA MANAGER FRAMEWORK
  M:    Moritz Fischer <[email protected]>
  L:    [email protected]
@@@ -6444,7 -6460,6 +6465,7 @@@ M:      Frank Li <[email protected]
  L:    [email protected]
  S:    Maintained
  F:    drivers/perf/fsl_imx8_ddr_perf.c
 +F:    Documentation/admin-guide/perf/imx-ddr.rst
  F:    Documentation/devicetree/bindings/perf/fsl-imx-ddr.txt
  
  FREESCALE IMX I2C DRIVER
@@@ -6738,13 -6753,6 +6759,13 @@@ W:    https://linuxtv.or
  S:    Maintained
  F:    drivers/media/radio/radio-gemtek*
  
 +GENERIC ARCHITECTURE TOPOLOGY
 +M:    Sudeep Holla <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/base/arch_topology.c
 +F:    include/linux/arch_topology.h
 +
  GENERIC GPIO I2C DRIVER
  M:    Wolfram Sang <[email protected]>
  S:    Supported
@@@ -6757,7 -6765,7 +6778,7 @@@ L:      [email protected]
  S:    Supported
  F:    drivers/i2c/muxes/i2c-mux-gpio.c
  F:    include/linux/platform_data/i2c-mux-gpio.h
 -F:    Documentation/i2c/muxes/i2c-mux-gpio
 +F:    Documentation/i2c/muxes/i2c-mux-gpio.rst
  
  GENERIC HDLC (WAN) DRIVERS
  M:    Krzysztof Halasa <[email protected]>
@@@ -7001,6 -7009,9 +7022,9 @@@ M:      Alex Elder <[email protected]
  M:    Greg Kroah-Hartman <[email protected]>
  S:    Maintained
  F:    drivers/staging/greybus/
+ F:    drivers/greybus/
+ F:    include/linux/greybus.h
+ F:    include/linux/greybus/
  L:    [email protected] (moderated for non-subscribers)
  
  GREYBUS UART PROTOCOLS DRIVERS
@@@ -7506,14 -7517,14 +7530,14 @@@ I2C CONTROLLER DRIVER FOR NVIDIA GP
  M:    Ajay Gupta <[email protected]>
  L:    [email protected]
  S:    Maintained
 -F:    Documentation/i2c/busses/i2c-nvidia-gpu
 +F:    Documentation/i2c/busses/i2c-nvidia-gpu.rst
  F:    drivers/i2c/busses/i2c-nvidia-gpu.c
  
  I2C MUXES
  M:    Peter Rosin <[email protected]>
  L:    [email protected]
  S:    Maintained
 -F:    Documentation/i2c/i2c-topology
 +F:    Documentation/i2c/i2c-topology.rst
  F:    Documentation/i2c/muxes/
  F:    Documentation/devicetree/bindings/i2c/i2c-mux*
  F:    Documentation/devicetree/bindings/i2c/i2c-arb*
@@@ -7526,15 -7537,15 +7550,15 @@@ I2C MV64XXX MARVELL AND ALLWINNER DRIVE
  M:    Gregory CLEMENT <[email protected]>
  L:    [email protected]
  S:    Maintained
 -F:    Documentation/devicetree/bindings/i2c/i2c-mv64xxx.txt
 +F:    Documentation/devicetree/bindings/i2c/marvell,mv64xxx-i2c.yaml
  F:    drivers/i2c/busses/i2c-mv64xxx.c
  
  I2C OVER PARALLEL PORT
  M:    Jean Delvare <[email protected]>
  L:    [email protected]
  S:    Maintained
 -F:    Documentation/i2c/busses/i2c-parport
 -F:    Documentation/i2c/busses/i2c-parport-light
 +F:    Documentation/i2c/busses/i2c-parport.rst
 +F:    Documentation/i2c/busses/i2c-parport-light.rst
  F:    drivers/i2c/busses/i2c-parport.c
  F:    drivers/i2c/busses/i2c-parport-light.c
  
@@@ -7568,7 -7579,7 +7592,7 @@@ I2C-TAOS-EVM DRIVE
  M:    Jean Delvare <[email protected]>
  L:    [email protected]
  S:    Maintained
 -F:    Documentation/i2c/busses/i2c-taos-evm
 +F:    Documentation/i2c/busses/i2c-taos-evm.rst
  F:    drivers/i2c/busses/i2c-taos-evm.c
  
  I2C-TINY-USB DRIVER
@@@ -7582,19 -7593,19 +7606,19 @@@ I2C/SMBUS CONTROLLER DRIVERS FOR P
  M:    Jean Delvare <[email protected]>
  L:    [email protected]
  S:    Maintained
 -F:    Documentation/i2c/busses/i2c-ali1535
 -F:    Documentation/i2c/busses/i2c-ali1563
 -F:    Documentation/i2c/busses/i2c-ali15x3
 -F:    Documentation/i2c/busses/i2c-amd756
 -F:    Documentation/i2c/busses/i2c-amd8111
 -F:    Documentation/i2c/busses/i2c-i801
 -F:    Documentation/i2c/busses/i2c-nforce2
 -F:    Documentation/i2c/busses/i2c-piix4
 -F:    Documentation/i2c/busses/i2c-sis5595
 -F:    Documentation/i2c/busses/i2c-sis630
 -F:    Documentation/i2c/busses/i2c-sis96x
 -F:    Documentation/i2c/busses/i2c-via
 -F:    Documentation/i2c/busses/i2c-viapro
 +F:    Documentation/i2c/busses/i2c-ali1535.rst
 +F:    Documentation/i2c/busses/i2c-ali1563.rst
 +F:    Documentation/i2c/busses/i2c-ali15x3.rst
 +F:    Documentation/i2c/busses/i2c-amd756.rst
 +F:    Documentation/i2c/busses/i2c-amd8111.rst
 +F:    Documentation/i2c/busses/i2c-i801.rst
 +F:    Documentation/i2c/busses/i2c-nforce2.rst
 +F:    Documentation/i2c/busses/i2c-piix4.rst
 +F:    Documentation/i2c/busses/i2c-sis5595.rst
 +F:    Documentation/i2c/busses/i2c-sis630.rst
 +F:    Documentation/i2c/busses/i2c-sis96x.rst
 +F:    Documentation/i2c/busses/i2c-via.rst
 +F:    Documentation/i2c/busses/i2c-viapro.rst
  F:    drivers/i2c/busses/i2c-ali1535.c
  F:    drivers/i2c/busses/i2c-ali1563.c
  F:    drivers/i2c/busses/i2c-ali15x3.c
@@@ -7623,7 -7634,7 +7647,7 @@@ M:      Seth Heasley <[email protected]
  M:    Neil Horman <[email protected]>
  L:    [email protected]
  F:    drivers/i2c/busses/i2c-ismt.c
 -F:    Documentation/i2c/busses/i2c-ismt
 +F:    Documentation/i2c/busses/i2c-ismt.rst
  
  I2C/SMBUS STUB DRIVER
  M:    Jean Delvare <[email protected]>
@@@ -8373,7 -8384,7 +8397,7 @@@ M:      [email protected]
  L:    [email protected] (subscribers-only)
  S:    Supported
  W:    http://linuxwimax.org
 -F:    Documentation/wimax/README.i2400m
 +F:    Documentation/admin-guide/wimax/i2400m.rst
  F:    drivers/net/wimax/i2400m/
  F:    include/uapi/linux/wimax/i2400m.h
  
@@@ -8398,6 -8409,12 +8422,6 @@@ F:     Documentation/x86/intel_txt.rs
  F:    include/linux/tboot.h
  F:    arch/x86/kernel/tboot.c
  
 -INTEL-MID GPIO DRIVER
 -M:    David Cohen <[email protected]>
 -L:    [email protected]
 -S:    Maintained
 -F:    drivers/gpio/gpio-intel-mid.c
 -
  INTERCONNECT API
  M:    Georgi Djakov <[email protected]>
  L:    [email protected]
@@@ -8422,6 -8439,12 +8446,6 @@@ L:     [email protected]
  S:    Maintained
  F:    drivers/net/ethernet/sgi/ioc3-eth.c
  
 -IOC3 SERIAL DRIVER
 -M:    Pat Gefre <[email protected]>
 -L:    [email protected]
 -S:    Maintained
 -F:    drivers/tty/serial/ioc3_serial.c
 -
  IOMAP FILESYSTEM LIBRARY
  M:    Christoph Hellwig <[email protected]>
  M:    Darrick J. Wong <[email protected]>
@@@ -8455,6 -8478,11 +8479,6 @@@ S:     Maintaine
  F:    fs/io_uring.c
  F:    include/uapi/linux/io_uring.h
  
 -IP MASQUERADING
 -M:    Juanjo Ciarlante <[email protected]>
 -S:    Maintained
 -F:    net/ipv4/netfilter/ipt_MASQUERADE.c
 -
  IPMI SUBSYSTEM
  M:    Corey Minyard <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
@@@ -8658,7 -8686,7 +8682,7 @@@ L:      [email protected]
  W:    http://jfs.sourceforge.net/
  T:    git git://github.com/kleikamp/linux-shaggy.git
  S:    Maintained
 -F:    Documentation/filesystems/jfs.txt
 +F:    Documentation/admin-guide/jfs.rst
  F:    fs/jfs/
  
  JME NETWORK DRIVER
@@@ -8828,6 -8856,14 +8852,6 @@@ F:     virt/kvm/
  F:    tools/kvm/
  F:    tools/testing/selftests/kvm/
  
 -KERNEL VIRTUAL MACHINE FOR AMD-V (KVM/amd)
 -M:    Joerg Roedel <[email protected]>
 -L:    [email protected]
 -W:    http://www.linux-kvm.org/
 -S:    Maintained
 -F:    arch/x86/include/asm/svm.h
 -F:    arch/x86/kvm/svm.c
 -
  KERNEL VIRTUAL MACHINE FOR ARM/ARM64 (KVM/arm, KVM/arm64)
  M:    Marc Zyngier <[email protected]>
  R:    James Morse <[email protected]>
@@@ -8870,7 -8906,7 +8894,7 @@@ M:      Christian Borntraeger <borntraeger@d
  M:    Janosch Frank <[email protected]>
  R:    David Hildenbrand <[email protected]>
  R:    Cornelia Huck <[email protected]>
 -L:    linux-s390@vger.kernel.org
 +L:    kvm@vger.kernel.org
  W:    http://www.ibm.com/developerworks/linux/linux390/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git
  S:    Supported
@@@ -8885,11 -8921,6 +8909,11 @@@ F:    tools/testing/selftests/kvm/*/s390x
  KERNEL VIRTUAL MACHINE FOR X86 (KVM/x86)
  M:    Paolo Bonzini <[email protected]>
  M:    Radim Krčmář <[email protected]>
 +R:    Sean Christopherson <[email protected]>
 +R:    Vitaly Kuznetsov <[email protected]>
 +R:    Wanpeng Li <[email protected]>
 +R:    Jim Mattson <[email protected]>
 +R:    Joerg Roedel <[email protected]>
  L:    [email protected]
  W:    http://www.linux-kvm.org
  T:    git git://git.kernel.org/pub/scm/virt/kvm/kvm.git
@@@ -8897,12 -8928,8 +8921,12 @@@ S:    Supporte
  F:    arch/x86/kvm/
  F:    arch/x86/kvm/*/
  F:    arch/x86/include/uapi/asm/kvm*
 +F:    arch/x86/include/uapi/asm/vmx.h
 +F:    arch/x86/include/uapi/asm/svm.h
  F:    arch/x86/include/asm/kvm*
  F:    arch/x86/include/asm/pvclock-abi.h
 +F:    arch/x86/include/asm/svm.h
 +F:    arch/x86/include/asm/vmx.h
  F:    arch/x86/kernel/kvm.c
  F:    arch/x86/kernel/kvmclock.c
  
@@@ -8934,7 -8961,7 +8958,7 @@@ F:      security/keys/encrypted-keys
  
  KEYS-TRUSTED
  M:    James Bottomley <[email protected]>
 -M:      Jarkko Sakkinen <[email protected]>
 +M:    Jarkko Sakkinen <[email protected]>
  M:    Mimi Zohar <[email protected]>
  L:    [email protected]
  L:    [email protected]
@@@ -9001,7 -9028,7 +9025,7 @@@ F:      kernel/kprobes.
  KS0108 LCD CONTROLLER DRIVER
  M:    Miguel Ojeda Sandonis <[email protected]>
  S:    Maintained
 -F:    Documentation/auxdisplay/ks0108
 +F:    Documentation/admin-guide/auxdisplay/ks0108.rst
  F:    drivers/auxdisplay/ks0108.c
  F:    include/linux/ks0108.h
  
@@@ -9230,18 -9257,6 +9254,18 @@@ F:    include/linux/nd.
  F:    include/linux/libnvdimm.h
  F:    include/uapi/linux/ndctl.h
  
 +LICENSES and SPDX stuff
 +M:    Thomas Gleixner <[email protected]>
 +M:    Greg Kroah-Hartman <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/spdx.git
 +F:    COPYING
 +F:    Documentation/process/license-rules.rst
 +F:    LICENSES/
 +F:    scripts/spdxcheck-test.sh
 +F:    scripts/spdxcheck.py
 +
  LIGHTNVM PLATFORM SUPPORT
  M:    Matias Bjorling <[email protected]>
  W:    http://github/OpenChannelSSD
@@@ -9348,7 -9363,7 +9372,7 @@@ F:      drivers/misc/lkdtm/
  
  LINUX KERNEL MEMORY CONSISTENCY MODEL (LKMM)
  M:    Alan Stern <[email protected]>
 -M:    Andrea Parri <andrea.parri@amarulasolutions.com>
 +M:    Andrea Parri <parri.andrea@gmail.com>
  M:    Will Deacon <[email protected]>
  M:    Peter Zijlstra <[email protected]>
  M:    Boqun Feng <[email protected]>
@@@ -9356,7 -9371,7 +9380,7 @@@ M:      Nicholas Piggin <[email protected]
  M:    David Howells <[email protected]>
  M:    Jade Alglave <[email protected]>
  M:    Luc Maranget <[email protected]>
 -M:    "Paul E. McKenney" <paulmck@linux.ibm.com>
 +M:    "Paul E. McKenney" <paulmck@kernel.org>
  R:    Akira Yokosawa <[email protected]>
  R:    Daniel Lustig <[email protected]>
  L:    [email protected]
@@@ -9590,7 -9605,7 +9614,7 @@@ F:      Documentation/networking/mac80211-in
  F:    include/net/mac80211.h
  F:    net/mac80211/
  F:    drivers/net/wireless/mac80211_hwsim.[ch]
 -F:    Documentation/networking/mac80211_hwsim/README
 +F:    Documentation/networking/mac80211_hwsim/mac80211_hwsim.rst
  
  MAILBOX API
  M:    Jassi Brar <[email protected]>
@@@ -10039,8 -10054,8 +10063,8 @@@ L:   [email protected]
  L:    [email protected]
  T:    git git://linuxtv.org/media_tree.git
  S:    Supported
 -F:    Documentation/devicetree/bindings/media/renesas,rcar-csi2.txt
 -F:    Documentation/devicetree/bindings/media/rcar_vin.txt
 +F:    Documentation/devicetree/bindings/media/renesas,csi2.txt
 +F:    Documentation/devicetree/bindings/media/renesas,vin.txt
  F:    drivers/media/platform/rcar-vin/
  
  MEDIA DRIVERS FOR RENESAS - VSP1
@@@ -10367,7 -10382,7 +10391,7 @@@ L:   [email protected]
  S:    Supported
  F:    drivers/i2c/busses/i2c-mlxcpld.c
  F:    drivers/i2c/muxes/i2c-mux-mlxcpld.c
 -F:    Documentation/i2c/busses/i2c-mlxcpld
 +F:    Documentation/i2c/busses/i2c-mlxcpld.rst
  
  MELLANOX MLXCPLD LED DRIVER
  M:    Vadim Pasternak <[email protected]>
@@@ -10385,7 -10400,7 +10409,7 @@@ F:   drivers/platform/x86/mlx-platform.
  
  MEMBARRIER SUPPORT
  M:    Mathieu Desnoyers <[email protected]>
 -M:    "Paul E. McKenney" <paulmck@linux.ibm.com>
 +M:    "Paul E. McKenney" <paulmck@kernel.org>
  L:    [email protected]
  S:    Supported
  F:    kernel/sched/membarrier.c
@@@ -10637,6 -10652,12 +10661,6 @@@ M:  Nicolas Ferre <nicolas.ferre@microch
  S:    Supported
  F:    drivers/power/reset/at91-sama5d2_shdwc.c
  
 -MICROCHIP SAMA5D2-COMPATIBLE PIOBU GPIO
 -M:    Andrei Stefanescu <[email protected]>
 -L:    [email protected] (moderated for non-subscribers)
 -L:    [email protected]
 -F:    drivers/gpio/gpio-sama5d2-piobu.c
 -
  MICROCHIP SPI DRIVER
  M:    Nicolas Ferre <[email protected]>
  S:    Supported
@@@ -10649,6 -10670,13 +10673,6 @@@ S:  Supporte
  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)
@@@ -11081,7 -11109,7 +11105,7 @@@ NET_FAILOVER MODUL
  M:    Sridhar Samudrala <[email protected]>
  L:    [email protected]
  S:    Supported
 -F:    driver/net/net_failover.c
 +F:    drivers/net/net_failover.c
  F:    include/net/net_failover.h
  F:    Documentation/networking/net_failover.rst
  
@@@ -11856,21 -11884,6 +11880,21 @@@ T: git git://linuxtv.org/media_tree.gi
  S:    Maintained
  F:    drivers/media/i2c/ov5647.c
  
 +OMNIVISION OV5670 SENSOR DRIVER
 +M:    Chiranjeevi Rapolu <[email protected]>
 +M:    Hyungwoo Yang <[email protected]>
 +L:    [email protected]
 +T:    git git://linuxtv.org/media_tree.git
 +S:    Maintained
 +F:    drivers/media/i2c/ov5670.c
 +
 +OMNIVISION OV5675 SENSOR DRIVER
 +M:    Shawn Tu <[email protected]>
 +L:    [email protected]
 +T:    git git://linuxtv.org/media_tree.git
 +S:    Maintained
 +F:    drivers/media/i2c/ov5675.c
 +
  OMNIVISION OV5695 SENSOR DRIVER
  M:    Shunqian Zheng <[email protected]>
  L:    [email protected]
@@@ -11992,7 -12005,7 +12016,7 @@@ M:   Andrew Lunn <[email protected]
  L:    [email protected]
  S:    Maintained
  F:    Documentation/devicetree/bindings/i2c/i2c-ocores.txt
 -F:    Documentation/i2c/busses/i2c-ocores
 +F:    Documentation/i2c/busses/i2c-ocores.rst
  F:    drivers/i2c/busses/i2c-ocores.c
  F:    include/linux/platform_data/i2c-ocores.h
  
@@@ -12115,7 -12128,7 +12139,7 @@@ L:   [email protected]
  S:    Supported
  F:    lib/packing.c
  F:    include/linux/packing.h
 -F:    Documentation/packing.txt
 +F:    Documentation/core-api/packing.rst
  
  PADATA PARALLEL EXECUTION MECHANISM
  M:    Steffen Klassert <[email protected]>
@@@ -12616,7 -12629,6 +12640,7 @@@ PERFORMANCE EVENTS SUBSYSTE
  M:    Peter Zijlstra <[email protected]>
  M:    Ingo Molnar <[email protected]>
  M:    Arnaldo Carvalho de Melo <[email protected]>
 +R:    Mark Rutland <[email protected]>
  R:    Alexander Shishkin <[email protected]>
  R:    Jiri Olsa <[email protected]>
  R:    Namhyung Kim <[email protected]>
@@@ -12706,7 -12718,6 +12730,7 @@@ L:   [email protected]
  L:    [email protected]
  S:    Supported
  F:    drivers/pinctrl/pinctrl-at91*
 +F:    drivers/gpio/gpio-sama5d2-piobu.c
  
  PIN CONTROLLER - FREESCALE
  M:    Dong Aisheng <[email protected]>
@@@ -12803,6 -12814,12 +12827,12 @@@ F: drivers/i2c/busses/i2c-puv3.
  F:    drivers/video/fbdev/fb-puv3.c
  F:    drivers/rtc/rtc-puv3.c
  
+ PLANTOWER PMS7003 AIR POLLUTION SENSOR DRIVER
+ M:    Tomasz Duszynski <[email protected]>
+ S:    Maintained
+ F:    drivers/iio/chemical/pms7003.c
+ F:    Documentation/devicetree/bindings/iio/chemical/plantower,pms7003.yaml
+ 
  PMBUS HARDWARE MONITORING DRIVERS
  M:    Guenter Roeck <[email protected]>
  L:    [email protected]
@@@ -13313,8 -13330,8 +13343,8 @@@ QUALCOMM CPUFREQ DRIVER MSM8996/APQ809
  M:    Ilia Lin <[email protected]>
  L:    [email protected]
  S:    Maintained
 -F:    Documentation/devicetree/bindings/opp/kryo-cpufreq.txt
 -F:    drivers/cpufreq/qcom-cpufreq-kryo.c
 +F:    Documentation/devicetree/bindings/opp/qcom-nvmem-cpufreq.txt
 +F:    drivers/cpufreq/qcom-cpufreq-nvmem.c
  
  QUALCOMM EMAC GIGABIT ETHERNET DRIVER
  M:    Timur Tabi <[email protected]>
@@@ -13504,7 -13521,7 +13534,7 @@@ S:   Orpha
  F:    drivers/net/wireless/ray*
  
  RCUTORTURE TEST FRAMEWORK
 -M:    "Paul E. McKenney" <paulmck@linux.ibm.com>
 +M:    "Paul E. McKenney" <paulmck@kernel.org>
  M:    Josh Triplett <[email protected]>
  R:    Steven Rostedt <[email protected]>
  R:    Mathieu Desnoyers <[email protected]>
@@@ -13551,7 -13568,7 +13581,7 @@@ F:   arch/x86/include/asm/resctrl_sched.
  F:    Documentation/x86/resctrl*
  
  READ-COPY UPDATE (RCU)
 -M:    "Paul E. McKenney" <paulmck@linux.ibm.com>
 +M:    "Paul E. McKenney" <paulmck@kernel.org>
  M:    Josh Triplett <[email protected]>
  R:    Steven Rostedt <[email protected]>
  R:    Mathieu Desnoyers <[email protected]>
@@@ -13709,7 -13726,7 +13739,7 @@@ F:   include/linux/reset-controller.
  RESTARTABLE SEQUENCES SUPPORT
  M:    Mathieu Desnoyers <[email protected]>
  M:    Peter Zijlstra <[email protected]>
 -M:    "Paul E. McKenney" <paulmck@linux.ibm.com>
 +M:    "Paul E. McKenney" <paulmck@kernel.org>
  M:    Boqun Feng <[email protected]>
  L:    [email protected]
  S:    Supported
@@@ -13772,8 -13789,7 +13802,8 @@@ F:   include/linux/hid-roccat
  F:    Documentation/ABI/*/sysfs-driver-hid-roccat*
  
  ROCKCHIP RASTER 2D GRAPHIC ACCELERATION UNIT DRIVER
 -M:    Jacob chen <[email protected]>
 +M:    Jacob Chen <[email protected]>
 +M:    Ezequiel Garcia <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    drivers/media/platform/rockchip/rga/
@@@ -13783,7 -13799,7 +13813,7 @@@ HANTRO VPU CODEC DRIVE
  M:    Ezequiel Garcia <[email protected]>
  L:    [email protected]
  S:    Maintained
 -F:    drivers/staging/media/platform/hantro/
 +F:    drivers/staging/media/hantro/
  F:    Documentation/devicetree/bindings/media/rockchip-vpu.txt
  
  ROCKER DRIVER
@@@ -14141,8 -14157,6 +14171,8 @@@ M:   Kamil Konieczny <k.konieczny@partner
  L:    [email protected]
  L:    [email protected]
  S:    Maintained
 +F:    Documentation/devicetree/bindings/crypto/samsung-slimsss.txt
 +F:    Documentation/devicetree/bindings/crypto/samsung-sss.txt
  F:    drivers/crypto/s5p-sss.c
  
  SAMSUNG S5P/EXYNOS4 SOC SERIES CAMERA SUBSYSTEM DRIVERS
@@@ -14163,8 -14177,6 +14193,8 @@@ T:   git git://git.kernel.org/pub/scm/lin
  F:    drivers/clk/samsung/
  F:    include/dt-bindings/clock/exynos*.h
  F:    Documentation/devicetree/bindings/clock/exynos*.txt
 +F:    Documentation/devicetree/bindings/clock/samsung,s3c*
 +F:    Documentation/devicetree/bindings/clock/samsung,s5p*
  
  SAMSUNG SPI DRIVERS
  M:    Kukjin Kim <[email protected]>
@@@ -14215,12 -14227,6 +14245,12 @@@ F: drivers/watchdog/sc1200wdt.
  SCHEDULER
  M:    Ingo Molnar <[email protected]>
  M:    Peter Zijlstra <[email protected]>
 +M:    Juri Lelli <[email protected]> (SCHED_DEADLINE)
 +M:    Vincent Guittot <[email protected]> (SCHED_NORMAL)
 +R:    Dietmar Eggemann <[email protected]> (SCHED_NORMAL)
 +R:    Steven Rostedt <[email protected]> (SCHED_FIFO/SCHED_RR)
 +R:    Ben Segall <[email protected]> (CONFIG_CFS_BANDWIDTH)
 +R:    Mel Gorman <[email protected]> (CONFIG_NUMA_BALANCING)
  L:    [email protected]
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git sched/core
  S:    Maintained
@@@ -14315,7 -14321,7 +14345,7 @@@ F:   net/sctp
  SCx200 CPU SUPPORT
  M:    Jim Cromie <[email protected]>
  S:    Odd Fixes
 -F:    Documentation/i2c/busses/scx200_acb
 +F:    Documentation/i2c/busses/scx200_acb.rst
  F:    arch/x86/platform/scx200/
  F:    drivers/watchdog/scx200_wdt.c
  F:    drivers/i2c/busses/scx200*
@@@ -14501,7 -14507,6 +14531,7 @@@ F:   drivers/net/phy/phylink.
  F:    drivers/net/phy/sfp*
  F:    include/linux/phylink.h
  F:    include/linux/sfp.h
 +K:    phylink
  
  SGI GRU DRIVER
  M:    Dimitri Sivanich <[email protected]>
@@@ -14756,7 -14761,7 +14786,7 @@@ F:   mm/sl?b
  
  SLEEPABLE READ-COPY UPDATE (SRCU)
  M:    Lai Jiangshan <[email protected]>
 -M:    "Paul E. McKenney" <paulmck@linux.ibm.com>
 +M:    "Paul E. McKenney" <paulmck@kernel.org>
  M:    Josh Triplett <[email protected]>
  R:    Steven Rostedt <[email protected]>
  R:    Mathieu Desnoyers <[email protected]>
@@@ -14907,9 -14912,9 +14937,9 @@@ F:   include/linux/arm_sdei.
  F:    include/uapi/linux/arm_sdei.h
  
  SOFTWARE RAID (Multiple Disks) SUPPORT
 -M:    Shaohua Li <shli@kernel.org>
 +M:    Song Liu <song@kernel.org>
  L:    [email protected]
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/shli/md.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/song/md.git
  S:    Supported
  F:    drivers/md/Makefile
  F:    drivers/md/Kconfig
@@@ -15240,13 -15245,6 +15270,6 @@@ M:  H Hartley Sweeten <hsweeten@visionen
  S:    Odd Fixes
  F:    drivers/staging/comedi/
  
- STAGING - EROFS FILE SYSTEM
- M:    Gao Xiang <[email protected]>
- M:    Chao Yu <[email protected]>
- L:    [email protected]
- S:    Maintained
- F:    drivers/staging/erofs/
- 
  STAGING - FIELDBUS SUBSYSTEM
  M:    Sven Van Asbroeck <[email protected]>
  S:    Maintained
@@@ -15534,7 -15532,7 +15557,7 @@@ F:   Documentation/devicetree/bindings/gp
  SYNOPSYS DESIGNWARE AXI DMAC DRIVER
  M:    Eugeniy Paltsev <[email protected]>
  S:    Maintained
 -F:    drivers/dma/dwi-axi-dmac/
 +F:    drivers/dma/dw-axi-dmac/
  F:    Documentation/devicetree/bindings/dma/snps,dw-axi-dmac.txt
  
  SYNOPSYS DESIGNWARE DMAC DRIVER
@@@ -15591,7 -15589,6 +15614,7 @@@ F:   drivers/clk/clk-sc[mp]i.
  F:    drivers/cpufreq/sc[mp]i-cpufreq.c
  F:    drivers/firmware/arm_scpi.c
  F:    drivers/firmware/arm_scmi/
 +F:    drivers/reset/reset-scmi.c
  F:    include/linux/sc[mp]i_protocol.h
  
  SYSTEM RESET/SHUTDOWN DRIVERS
@@@ -15900,7 -15897,6 +15923,7 @@@ 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:    drivers/soc/ti/ti_sci_pm_domains.c
 +F:    include/dt-bindings/soc/ti,sci_pm_domain.h
  F:    Documentation/devicetree/bindings/reset/ti,sci-reset.txt
  F:    Documentation/devicetree/bindings/clock/ti,sci-clk.txt
  F:    drivers/clk/keystone/sci-clk.c
@@@ -15954,7 -15950,7 +15977,7 @@@ M:   Viresh Kumar <[email protected]
  M:    Javi Merino <[email protected]>
  L:    [email protected]
  S:    Supported
 -F:    Documentation/thermal/cpu-cooling-api.rst
 +F:    Documentation/driver-api/thermal/cpu-cooling-api.rst
  F:    drivers/thermal/cpu_cooling.c
  F:    include/linux/cpu_cooling.h
  
@@@ -16255,7 -16251,7 +16278,7 @@@ F:   drivers/platform/x86/topstar-laptop.
  
  TORTURE-TEST MODULES
  M:    Davidlohr Bueso <[email protected]>
 -M:    "Paul E. McKenney" <paulmck@linux.ibm.com>
 +M:    "Paul E. McKenney" <paulmck@kernel.org>
  M:    Josh Triplett <[email protected]>
  L:    [email protected]
  S:    Supported
@@@ -16477,7 -16473,7 +16500,7 @@@ F:   drivers/hid/hid-udraw-ps3.
  UFS FILESYSTEM
  M:    Evgeniy Dushistov <[email protected]>
  S:    Maintained
 -F:    Documentation/filesystems/ufs.txt
 +F:    Documentation/admin-guide/ufs.rst
  F:    fs/ufs/
  
  UHID USERSPACE HID IO DRIVER:
@@@ -16495,9 -16491,11 +16518,9 @@@ F:  drivers/usb/common/ulpi.
  F:    include/linux/ulpi/
  
  ULTRA-WIDEBAND (UWB) SUBSYSTEM:
 -L:    [email protected]
 -S:    Orphan
 -F:    drivers/uwb/
 -F:    include/linux/uwb.h
 -F:    include/linux/uwb/
 +L:    [email protected]
 +S:    Obsolete
 +F:    drivers/staging/uwb/
  
  UNICODE SUBSYSTEM:
  M:    Gabriel Krisman Bertazi <[email protected]>
@@@ -17230,7 -17228,6 +17253,7 @@@ M:   "VMware, Inc." <[email protected]
  L:    [email protected]
  S:    Supported
  F:    arch/x86/kernel/cpu/vmware.c
 +F:    arch/x86/include/asm/vmware.h
  
  VMWARE PVRDMA DRIVER
  M:    Adit Ranadive <[email protected]>
@@@ -17280,7 -17277,6 +17303,7 @@@ F:   Documentation/power/regulator
  F:    drivers/regulator/
  F:    include/dt-bindings/regulator/
  F:    include/linux/regulator/
 +K:    regulator_get_optional
  
  VRF
  M:    David Ahern <[email protected]>
@@@ -17395,7 -17391,7 +17418,7 @@@ M:   [email protected]
  L:    [email protected] (subscribers-only)
  S:    Supported
  W:    http://linuxwimax.org
 -F:    Documentation/wimax/README.wimax
 +F:    Documentation/admin-guide/wimax/wimax.rst
  F:    include/linux/wimax/debug.h
  F:    include/net/wimax.h
  F:    include/uapi/linux/wimax.h
@@@ -17549,7 -17545,7 +17572,7 @@@ M:   Darren Hart <[email protected]
  M:    Andy Shevchenko <[email protected]>
  L:    [email protected]
  T:    git git://git.infradead.org/linux-platform-drivers-x86.git
 -S:    Maintained
 +S:    Odd Fixes
  F:    drivers/platform/x86/
  F:    drivers/platform/olpc/
  
@@@ -17717,7 -17713,8 +17740,7 @@@ F:   include/uapi/linux/dqblk_xfs.
  F:    include/uapi/linux/fsmap.h
  
  XILINX AXI ETHERNET DRIVER
 -M:    Anirudha Sarangi <[email protected]>
 -M:    John Linn <[email protected]>
 +M:    Radhey Shyam Pandey <[email protected]>
  S:    Maintained
  F:    drivers/net/ethernet/xilinx/xilinx_axienet*
  
@@@ -17846,6 -17843,14 +17869,6 @@@ S:  Maintaine
  F:    mm/zpool.c
  F:    include/linux/zpool.h
  
 -ZR36067 VIDEO FOR LINUX DRIVER
 -L:    [email protected]
 -L:    [email protected]
 -W:    http://mjpeg.sourceforge.net/driver-zoran/
 -T:    hg https://linuxtv.org/hg/v4l-dvb
 -S:    Odd Fixes
 -F:    drivers/staging/media/zoran/
 -
  ZRAM COMPRESSED RAM BLOCK DEVICE DRVIER
  M:    Minchan Kim <[email protected]>
  M:    Nitin Gupta <[email protected]>

diff --combined drivers/Kconfig
index 13f09bf64a0f63326f9039bf8e9fe5e4898e6dbb,7dce76ae7369239fbe3d4061ecdbc951d97af986..8befa53f43beb57babb2919b5e1bd0a0eda31e0f
--- 1/drivers/Kconfig
--- 2/drivers/Kconfig
+++ b/drivers/Kconfig
@@@ -30,6 -30,8 +30,6 @@@ source "drivers/block/Kconfig
  
  source "drivers/nvme/Kconfig"
  
 -# misc before ide - BLK_DEV_SGIIOC4 depends on SGI_IOC4
 -
  source "drivers/misc/Kconfig"
  
  source "drivers/ide/Kconfig"
@@@ -106,6 -108,8 +106,6 @@@ source "drivers/hid/Kconfig
  
  source "drivers/usb/Kconfig"
  
 -source "drivers/uwb/Kconfig"
 -
  source "drivers/mmc/Kconfig"
  
  source "drivers/memstick/Kconfig"
@@@ -142,6 -146,8 +142,8 @@@ source "drivers/hv/Kconfig
  
  source "drivers/xen/Kconfig"
  
+ source "drivers/greybus/Kconfig"
+ 
  source "drivers/staging/Kconfig"
  
  source "drivers/platform/Kconfig"

diff --combined drivers/Makefile
index ad66dc2325d7ea7d66e82b061d06e365e19bba6d,73df8e5a2fce30ce8a09381e78bdedba8642aa91..aaef17cc651287afb4b51fca89829b2efa743365
--- 1/drivers/Makefile
--- 2/drivers/Makefile
+++ b/drivers/Makefile
@@@ -100,6 -100,7 +100,6 @@@ obj-$(CONFIG_ZORRO)                += zorro
  obj-$(CONFIG_ATA_OVER_ETH)    += block/aoe/
  obj-$(CONFIG_PARIDE)          += block/paride/
  obj-$(CONFIG_TC)              += tc/
 -obj-$(CONFIG_UWB)             += uwb/
  obj-$(CONFIG_USB_PHY)         += usb/
  obj-$(CONFIG_USB)             += usb/
  obj-$(CONFIG_USB_SUPPORT)     += usb/
@@@ -131,6 -132,7 +131,6 @@@ obj-y                              += mmc
  obj-$(CONFIG_MEMSTICK)                += memstick/
  obj-$(CONFIG_NEW_LEDS)                += leds/
  obj-$(CONFIG_INFINIBAND)      += infiniband/
 -obj-$(CONFIG_SGI_SN)          += sn/
  obj-y                         += firmware/
  obj-$(CONFIG_CRYPTO)          += crypto/
  obj-$(CONFIG_SUPERH)          += sh/
@@@ -146,6 -148,7 +146,7 @@@ obj-$(CONFIG_BCMA)         += bcma
  obj-$(CONFIG_VHOST_RING)      += vhost/
  obj-$(CONFIG_VHOST)           += vhost/
  obj-$(CONFIG_VLYNQ)           += vlynq/
+ obj-$(CONFIG_GREYBUS)         += greybus/
  obj-$(CONFIG_STAGING)         += staging/
  obj-y                         += platform/
  

diff --combined drivers/staging/Kconfig
index cf419d9c942d013ae4f19c44a2bbeac02609544c,fbdc338747801b4129977bf3bd9451743bba61a7..b9c7f0dc653b9f48e3e1e24bd6727068239f64aa
--- 1/drivers/staging/Kconfig
--- 2/drivers/staging/Kconfig
+++ b/drivers/staging/Kconfig
@@@ -112,15 -112,12 +112,15 @@@ source "drivers/staging/gasket/Kconfig
  
  source "drivers/staging/axis-fifo/Kconfig"
  
- source "drivers/staging/erofs/Kconfig"
- 
  source "drivers/staging/fieldbus/Kconfig"
  
  source "drivers/staging/kpc2000/Kconfig"
  
  source "drivers/staging/isdn/Kconfig"
  
 +source "drivers/staging/wusbcore/Kconfig"
 +source "drivers/staging/uwb/Kconfig"
 +
+ source "drivers/staging/exfat/Kconfig"
+ 
  endif # STAGING

diff --combined drivers/staging/Makefile
index 38179bc842a8518b28672f5575161116ffa413c4,ca13f87b1e1b80140487a89485990fbe9ca1235e..4b5962006c4ba61d54491d246817a5e594a8d359
--- 1/drivers/staging/Makefile
--- 2/drivers/staging/Makefile
+++ b/drivers/staging/Makefile
@@@ -46,9 -46,7 +46,9 @@@ obj-$(CONFIG_DMA_RALINK)      += ralink-gdma
  obj-$(CONFIG_SOC_MT7621)      += mt7621-dts/
  obj-$(CONFIG_STAGING_GASKET_FRAMEWORK)        += gasket/
  obj-$(CONFIG_XIL_AXIS_FIFO)   += axis-fifo/
- obj-$(CONFIG_EROFS_FS)                += erofs/
  obj-$(CONFIG_FIELDBUS_DEV)     += fieldbus/
  obj-$(CONFIG_KPC2000)         += kpc2000/
  obj-$(CONFIG_ISDN_CAPI)               += isdn/
 +obj-$(CONFIG_UWB)             += uwb/
 +obj-$(CONFIG_USB_WUSB)                += wusbcore/
+ obj-$(CONFIG_EXFAT_FS)                += exfat/

diff --combined drivers/staging/media/hantro/hantro_drv.c
index d8b6816b643b2c142d9048bdec9ed3cdb9604210,4a7afad2af92344e891f6f1c7a0f778df4b65c77..6d9d41170832ff1f12cf5f1b8968a777dc67c8e0
--- 1/drivers/staging/media/hantro/hantro_drv.c
--- 2/drivers/staging/media/hantro/hantro_drv.c
+++ b/drivers/staging/media/hantro/hantro_drv.c
@@@ -111,6 -111,8 +111,6 @@@ static void hantro_job_finish(struct ha
        src->sequence = ctx->sequence_out++;
        dst->sequence = ctx->sequence_cap++;
  
 -      v4l2_m2m_buf_copy_metadata(src, dst, true);
 -
        ret = ctx->buf_finish(ctx, &dst->vb2_buf, bytesused);
        if (ret)
                result = VB2_BUF_STATE_ERROR;
@@@ -151,37 -153,11 +151,37 @@@ void hantro_watchdog(struct work_struc
        }
  }
  
 +void hantro_prepare_run(struct hantro_ctx *ctx)
 +{
 +      struct vb2_v4l2_buffer *src_buf;
 +
 +      src_buf = hantro_get_src_buf(ctx);
 +      v4l2_ctrl_request_setup(src_buf->vb2_buf.req_obj.req,
 +                              &ctx->ctrl_handler);
 +}
 +
 +void hantro_finish_run(struct hantro_ctx *ctx)
 +{
 +      struct vb2_v4l2_buffer *src_buf;
 +
 +      src_buf = hantro_get_src_buf(ctx);
 +      v4l2_ctrl_request_complete(src_buf->vb2_buf.req_obj.req,
 +                                 &ctx->ctrl_handler);
 +
 +      /* Kick the watchdog. */
 +      schedule_delayed_work(&ctx->dev->watchdog_work,
 +                            msecs_to_jiffies(2000));
 +}
 +
  static void device_run(void *priv)
  {
        struct hantro_ctx *ctx = priv;
 +      struct vb2_v4l2_buffer *src, *dst;
        int ret;
  
 +      src = hantro_get_src_buf(ctx);
 +      dst = hantro_get_dst_buf(ctx);
 +
        ret = clk_bulk_enable(ctx->dev->variant->num_clocks, ctx->dev->clocks);
        if (ret)
                goto err_cancel_job;
@@@ -189,8 -165,6 +189,8 @@@
        if (ret < 0)
                goto err_cancel_job;
  
 +      v4l2_m2m_buf_copy_metadata(src, dst, true);
 +
        ctx->codec_ops->run(ctx);
        return;
  
@@@ -288,74 -262,28 +288,74 @@@ static const struct v4l2_ctrl_ops hantr
        .s_ctrl = hantro_s_ctrl,
  };
  
 -static struct hantro_ctrl controls[] = {
 +static const struct hantro_ctrl controls[] = {
        {
 -              .id = V4L2_CID_JPEG_COMPRESSION_QUALITY,
                .codec = HANTRO_JPEG_ENCODER,
                .cfg = {
 +                      .id = V4L2_CID_JPEG_COMPRESSION_QUALITY,
                        .min = 5,
                        .max = 100,
                        .step = 1,
                        .def = 50,
 +                      .ops = &hantro_ctrl_ops,
                },
        }, {
 -              .id = V4L2_CID_MPEG_VIDEO_MPEG2_SLICE_PARAMS,
                .codec = HANTRO_MPEG2_DECODER,
                .cfg = {
 -                      .elem_size = sizeof(struct v4l2_ctrl_mpeg2_slice_params),
 +                      .id = V4L2_CID_MPEG_VIDEO_MPEG2_SLICE_PARAMS,
                },
        }, {
 -              .id = V4L2_CID_MPEG_VIDEO_MPEG2_QUANTIZATION,
                .codec = HANTRO_MPEG2_DECODER,
                .cfg = {
 -                      .elem_size = sizeof(struct v4l2_ctrl_mpeg2_quantization),
 +                      .id = V4L2_CID_MPEG_VIDEO_MPEG2_QUANTIZATION,
 +              },
 +      }, {
 +              .codec = HANTRO_VP8_DECODER,
 +              .cfg = {
 +                      .id = V4L2_CID_MPEG_VIDEO_VP8_FRAME_HEADER,
 +              },
 +      }, {
 +              .codec = HANTRO_H264_DECODER,
 +              .cfg = {
 +                      .id = V4L2_CID_MPEG_VIDEO_H264_DECODE_PARAMS,
                },
 +      }, {
 +              .codec = HANTRO_H264_DECODER,
 +              .cfg = {
 +                      .id = V4L2_CID_MPEG_VIDEO_H264_SLICE_PARAMS,
 +              },
 +      }, {
 +              .codec = HANTRO_H264_DECODER,
 +              .cfg = {
 +                      .id = V4L2_CID_MPEG_VIDEO_H264_SPS,
 +              },
 +      }, {
 +              .codec = HANTRO_H264_DECODER,
 +              .cfg = {
 +                      .id = V4L2_CID_MPEG_VIDEO_H264_PPS,
 +              },
 +      }, {
 +              .codec = HANTRO_H264_DECODER,
 +              .cfg = {
 +                      .id = V4L2_CID_MPEG_VIDEO_H264_SCALING_MATRIX,
 +              },
 +      }, {
 +              .codec = HANTRO_H264_DECODER,
 +              .cfg = {
 +                      .id = V4L2_CID_MPEG_VIDEO_H264_DECODE_MODE,
 +                      .min = V4L2_MPEG_VIDEO_H264_DECODE_MODE_FRAME_BASED,
 +                      .def = V4L2_MPEG_VIDEO_H264_DECODE_MODE_FRAME_BASED,
 +                      .max = V4L2_MPEG_VIDEO_H264_DECODE_MODE_FRAME_BASED,
 +              },
 +      }, {
 +              .codec = HANTRO_H264_DECODER,
 +              .cfg = {
 +                      .id = V4L2_CID_MPEG_VIDEO_H264_START_CODE,
 +                      .min = V4L2_MPEG_VIDEO_H264_START_CODE_ANNEX_B,
 +                      .def = V4L2_MPEG_VIDEO_H264_START_CODE_ANNEX_B,
 +                      .max = V4L2_MPEG_VIDEO_H264_START_CODE_ANNEX_B,
 +              },
 +      }, {
        },
  };
  
@@@ -370,12 -298,22 +370,12 @@@ static int hantro_ctrls_setup(struct ha
        for (i = 0; i < num_ctrls; i++) {
                if (!(allowed_codecs & controls[i].codec))
                        continue;
 -              if (!controls[i].cfg.elem_size) {
 -                      v4l2_ctrl_new_std(&ctx->ctrl_handler,
 -                                        &hantro_ctrl_ops,
 -                                        controls[i].id, controls[i].cfg.min,
 -                                        controls[i].cfg.max,
 -                                        controls[i].cfg.step,
 -                                        controls[i].cfg.def);
 -              } else {
 -                      controls[i].cfg.id = controls[i].id;
 -                      v4l2_ctrl_new_custom(&ctx->ctrl_handler,
 -                                           &controls[i].cfg, NULL);
 -              }
  
 +              v4l2_ctrl_new_custom(&ctx->ctrl_handler,
 +                                   &controls[i].cfg, NULL);
                if (ctx->ctrl_handler.error) {
                        vpu_err("Adding control (%d) failed %d\n",
 -                              controls[i].id,
 +                              controls[i].cfg.id,
                                ctx->ctrl_handler.error);
                        v4l2_ctrl_handler_free(&ctx->ctrl_handler);
                        return ctx->ctrl_handler.error;
@@@ -481,7 -419,6 +481,7 @@@ static const struct v4l2_file_operation
  static const struct of_device_id of_hantro_match[] = {
  #ifdef CONFIG_VIDEO_HANTRO_ROCKCHIP
        { .compatible = "rockchip,rk3399-vpu", .data = &rk3399_vpu_variant, },
 +      { .compatible = "rockchip,rk3328-vpu", .data = &rk3328_vpu_variant, },
        { .compatible = "rockchip,rk3288-vpu", .data = &rk3288_vpu_variant, },
  #endif
        { /* sentinel */ }
@@@ -787,7 -724,6 +787,7 @@@ static int hantro_probe(struct platform
                dev_err(vpu->dev, "Could not set DMA coherent mask.\n");
                return ret;
        }
 +      vb2_dma_contig_set_max_seg_size(&pdev->dev, DMA_BIT_MASK(32));
  
        for (i = 0; i < vpu->variant->num_irqs; i++) {
                const char *irq_name = vpu->variant->irqs[i].name;
@@@ -797,10 -733,8 +797,8 @@@
                        continue;
  
                irq = platform_get_irq_byname(vpu->pdev, irq_name);
-               if (irq <= 0) {
-                       dev_err(vpu->dev, "Could not get %s IRQ.\n", irq_name);
+               if (irq <= 0)
                        return -ENXIO;
-               }
  
                ret = devm_request_irq(vpu->dev, irq,
                                       vpu->variant->irqs[i].handler, 0,

diff --combined drivers/staging/media/imx/imx7-media-csi.c
index 4ca79ff4c9b32deef023b835e0e4ef35fe7151f3,d7d38dd9f1683a22760db36c94e976396e857c5a..bfd6b5fbf4841d35670b2d1d20648169c158f4e1
--- 1/drivers/staging/media/imx/imx7-media-csi.c
--- 2/drivers/staging/media/imx/imx7-media-csi.c
+++ b/drivers/staging/media/imx/imx7-media-csi.c
@@@ -1,6 -1,6 +1,6 @@@
  // SPDX-License-Identifier: GPL-2.0
  /*
 - * V4L2 Capture CSI Subdev for Freescale i.MX7 SOC
 + * V4L2 Capture CSI Subdev for Freescale i.MX6UL/L / i.MX7 SOC
   *
   * Copyright (c) 2019 Linaro Ltd
   *
@@@ -765,7 -765,6 +765,7 @@@ static int imx7_csi_configure(struct im
        struct v4l2_pix_format *out_pix = &vdev->fmt.fmt.pix;
        __u32 in_code = csi->format_mbus[IMX7_CSI_PAD_SINK].code;
        u32 cr1, cr18;
 +      int width = out_pix->width;
  
        if (out_pix->field == V4L2_FIELD_INTERLACED) {
                imx7_csi_deinterlace_enable(csi, true);
@@@ -775,27 -774,15 +775,27 @@@
                imx7_csi_buf_stride_set(csi, 0);
        }
  
 -      imx7_csi_set_imagpara(csi, out_pix->width, out_pix->height);
 +      cr18 = imx7_csi_reg_read(csi, CSI_CSICR18);
 +
 +      if (!csi->is_csi2) {
 +              if (out_pix->pixelformat == V4L2_PIX_FMT_UYVY ||
 +                  out_pix->pixelformat == V4L2_PIX_FMT_YUYV)
 +                      width *= 2;
 +
 +              imx7_csi_set_imagpara(csi, width, out_pix->height);
 +
 +              cr18 |= (BIT_BASEADDR_SWITCH_EN | BIT_BASEADDR_SWITCH_SEL |
 +                      BIT_BASEADDR_CHG_ERR_EN);
 +              imx7_csi_reg_write(csi, cr18, CSI_CSICR18);
  
 -      if (!csi->is_csi2)
                return 0;
 +      }
 +
 +      imx7_csi_set_imagpara(csi, width, out_pix->height);
  
        cr1 = imx7_csi_reg_read(csi, CSI_CSICR1);
        cr1 &= ~BIT_GCLK_MODE;
  
 -      cr18 = imx7_csi_reg_read(csi, CSI_CSICR18);
        cr18 &= BIT_MIPI_DATA_FORMAT_MASK;
        cr18 |= BIT_DATA_FROM_MIPI;
  
@@@ -830,9 -817,11 +830,9 @@@ static void imx7_csi_enable(struct imx7
  {
        imx7_csi_sw_reset(csi);
  
 -      if (csi->is_csi2) {
 -              imx7_csi_dmareq_rff_enable(csi);
 -              imx7_csi_hw_enable_irq(csi);
 -              imx7_csi_hw_enable(csi);
 -      }
 +      imx7_csi_dmareq_rff_enable(csi);
 +      imx7_csi_hw_enable_irq(csi);
 +      imx7_csi_hw_enable(csi);
  }
  
  static void imx7_csi_disable(struct imx7_csi *csi)
@@@ -1205,10 -1194,8 +1205,8 @@@ static int imx7_csi_probe(struct platfo
        }
  
        csi->irq = platform_get_irq(pdev, 0);
-       if (csi->irq < 0) {
-               dev_err(dev, "Missing platform resources data\n");
+       if (csi->irq < 0)
                return csi->irq;
-       }
  
        csi->regbase = devm_platform_ioremap_resource(pdev, 0);
        if (IS_ERR(csi->regbase))
@@@ -1313,7 -1300,6 +1311,7 @@@ static int imx7_csi_remove(struct platf
  
  static const struct of_device_id imx7_csi_of_match[] = {
        { .compatible = "fsl,imx7-csi" },
 +      { .compatible = "fsl,imx6ul-csi" },
        { },
  };
  MODULE_DEVICE_TABLE(of, imx7_csi_of_match);

diff --combined drivers/staging/media/sunxi/cedrus/cedrus_hw.c
index fc8579b90dabcca9479842d96b9a2b25d7829ab9,9ce3a65903c5d8be299fb5668839debcfc180c7e..a942cd9bed57e0ab5db61dd8747621dfbb55a6de
--- 1/drivers/staging/media/sunxi/cedrus/cedrus_hw.c
--- 2/drivers/staging/media/sunxi/cedrus/cedrus_hw.c
+++ b/drivers/staging/media/sunxi/cedrus/cedrus_hw.c
@@@ -79,6 -79,9 +79,6 @@@ void cedrus_dst_format_set(struct cedru
                reg = VE_PRIMARY_OUT_FMT_NV12;
                cedrus_write(dev, VE_PRIMARY_OUT_FMT, reg);
  
 -              reg = VE_CHROMA_BUF_LEN_SDRT(chroma_size / 2);
 -              cedrus_write(dev, VE_CHROMA_BUF_LEN, reg);
 -
                reg = chroma_size / 2;
                cedrus_write(dev, VE_PRIMARY_CHROMA_BUF_LEN, reg);
  
@@@ -157,11 -160,8 +157,8 @@@ int cedrus_hw_probe(struct cedrus_dev *
        dev->capabilities = variant->capabilities;
  
        irq_dec = platform_get_irq(dev->pdev, 0);
-       if (irq_dec <= 0) {
-               dev_err(dev->dev, "Failed to get IRQ\n");
- 
+       if (irq_dec <= 0)
                return irq_dec;
-       }
        ret = devm_request_irq(dev->dev, irq_dec, cedrus_irq,
                               0, dev_name(dev->dev), dev);
        if (ret) {