Merge v5.9-rc1 into drm-misc-next

Sam needs 5.9-rc1 to have dev_err_probe in to merge some patches.

Signed-off-by: Maxime Ripard <[email protected]>

diff --combined Documentation/devicetree/bindings/vendor-prefixes.yaml
index 1dd92dc7cbb37c244d648aa0b971c24fb38631fb,2baee2c817c1a107435c581bd94a2d1940c82331..25c89f92b5372fd3c529fff018e32d33fea6f7cf
--- 1/Documentation/devicetree/bindings/vendor-prefixes.yaml
--- 2/Documentation/devicetree/bindings/vendor-prefixes.yaml
+++ b/Documentation/devicetree/bindings/vendor-prefixes.yaml
@@@ -20,13 -20,17 +20,17 @@@ patternProperties
    "^(keypad|m25p|max8952|max8997|max8998|mpmc),.*": true
    "^(pinctrl-single|#pinctrl-single|PowerPC),.*": true
    "^(pl022|pxa-mmc|rcar_sound|rotary-encoder|s5m8767|sdhci),.*": true
-   "^(simple-audio-card|simple-graph-card|st-plgpio|st-spics|ts),.*": true
+   "^(simple-audio-card|st-plgpio|st-spics|ts),.*": true
  
    # Keep list in alphabetical order.
+   "^70mai,.*":
+     description: 70mai Co., Ltd.
    "^abilis,.*":
      description: Abilis Systems
    "^abracon,.*":
      description: Abracon Corporation
+   "^acer,.*":
+     description: Acer Inc.
    "^acme,.*":
      description: Acme Systems srl
    "^actions,.*":
@@@ -193,8 -197,6 +197,8 @@@
      description: Ceva, Inc.
    "^checkpoint,.*":
      description: Check Point Software Technologies Ltd.
 +  "^chefree,.*":
 +    description: Chefree Technology Corp.
    "^chipidea,.*":
      description: Chipidea, Inc
    "^chipone,.*":
@@@ -471,6 -473,8 +475,8 @@@
      description: ILI Technology Corporation (ILITEK)
    "^img,.*":
      description: Imagination Technologies Ltd.
+   "^imi,.*":
+     description: Integrated Micro-Electronics Inc.
    "^incircuit,.*":
      description: In-Circuit GmbH
    "^inet-tek,.*":
@@@ -597,8 -601,6 +603,8 @@@
      description: Logic Technologies Limited
    "^longcheer,.*":
      description: Longcheer Technology (Shanghai) Co., Ltd.
 +  "^lontium,.*":
 +    description: Lontium Semiconductor Corporation
    "^loongson,.*":
      description: Loongson Technology Corporation Limited
    "^lsi,.*":
@@@ -684,6 -686,8 +690,8 @@@
      description: Microsemi Corporation
    "^msi,.*":
      description: Micro-Star International Co. Ltd.
+   "^mstar,.*":
+     description: MStar Semiconductor, Inc. (acquired by MediaTek Inc.)
    "^mti,.*":
      description: Imagination Technologies Ltd. (formerly MIPS Technologies Inc.)
    "^multi-inno,.*":
@@@ -826,8 -830,6 +834,8 @@@
      description: Poslab Technology Co., Ltd.
    "^pov,.*":
      description: Point of View International B.V.
 +  "^powertip,.*":
 +    description: Powertip Tech. Corp.
    "^powervr,.*":
      description: PowerVR (deprecated, use img)
    "^primux,.*":
@@@ -990,6 -992,9 +998,9 @@@
      description: Spreadtrum Communications Inc.
    "^sst,.*":
      description: Silicon Storage Technology, Inc.
+   "^sstar,.*":
+     description: Xiamen Xingchen(SigmaStar) Technology Co., Ltd. 
+       (formerly part of MStar Semiconductor, Inc.)
    "^st,.*":
      description: STMicroelectronics
    "^starry,.*":
@@@ -1038,6 -1043,8 +1049,8 @@@
      description: Three Five Corp
    "^thine,.*":
      description: THine Electronics, Inc.
+   "^thingyjp,.*":
+     description: thingy.jp
    "^ti,.*":
      description: Texas Instruments
    "^tianma,.*":
@@@ -1175,6 -1182,8 +1188,8 @@@
      description: Shenzhen Xunlong Software CO.,Limited
    "^xylon,.*":
      description: Xylon
+   "^ylm,.*":
+     description: Shenzhen Yangliming Electronic Technology Co., Ltd.
    "^yna,.*":
      description: YSH & ATIL
    "^yones-toptech,.*":

diff --combined Documentation/gpu/drm-uapi.rst
index 9ce51e4f98f454f3d81eb1fee334ba0cdeadb187,496d8fcd4da0e1a9ad8e607dc6f24d3ac92ac761..7dce175f6d75bc13745d52f3ebea992d8c212698
--- 1/Documentation/gpu/drm-uapi.rst
--- 2/Documentation/gpu/drm-uapi.rst
+++ b/Documentation/gpu/drm-uapi.rst
@@@ -1,5 -1,3 +1,5 @@@
 +.. Copyright 2020 DisplayLink (UK) Ltd.
 +
  ===================
  Userland interfaces
  ===================
@@@ -164,116 -162,6 +164,116 @@@ other hand, a driver requires shared st
  visible to user-space and accessible beyond open-file boundaries, they
  cannot support render nodes.
  
 +Device Hot-Unplug
 +=================
 +
 +.. note::
 +   The following is the plan. Implementation is not there yet
 +   (2020 May).
 +
 +Graphics devices (display and/or render) may be connected via USB (e.g.
 +display adapters or docking stations) or Thunderbolt (e.g. eGPU). An end
 +user is able to hot-unplug this kind of devices while they are being
 +used, and expects that the very least the machine does not crash. Any
 +damage from hot-unplugging a DRM device needs to be limited as much as
 +possible and userspace must be given the chance to handle it if it wants
 +to. Ideally, unplugging a DRM device still lets a desktop continue to
 +run, but that is going to need explicit support throughout the whole
 +graphics stack: from kernel and userspace drivers, through display
 +servers, via window system protocols, and in applications and libraries.
 +
 +Other scenarios that should lead to the same are: unrecoverable GPU
 +crash, PCI device disappearing off the bus, or forced unbind of a driver
 +from the physical device.
 +
 +In other words, from userspace perspective everything needs to keep on
 +working more or less, until userspace stops using the disappeared DRM
 +device and closes it completely. Userspace will learn of the device
 +disappearance from the device removed uevent, ioctls returning ENODEV
 +(or driver-specific ioctls returning driver-specific things), or open()
 +returning ENXIO.
 +
 +Only after userspace has closed all relevant DRM device and dmabuf file
 +descriptors and removed all mmaps, the DRM driver can tear down its
 +instance for the device that no longer exists. If the same physical
 +device somehow comes back in the mean time, it shall be a new DRM
 +device.
 +
 +Similar to PIDs, chardev minor numbers are not recycled immediately. A
 +new DRM device always picks the next free minor number compared to the
 +previous one allocated, and wraps around when minor numbers are
 +exhausted.
 +
 +The goal raises at least the following requirements for the kernel and
 +drivers.
 +
 +Requirements for KMS UAPI
 +-------------------------
 +
 +- KMS connectors must change their status to disconnected.
 +
 +- Legacy modesets and pageflips, and atomic commits, both real and
 +  TEST_ONLY, and any other ioctls either fail with ENODEV or fake
 +  success.
 +
 +- Pending non-blocking KMS operations deliver the DRM events userspace
 +  is expecting. This applies also to ioctls that faked success.
 +
 +- open() on a device node whose underlying device has disappeared will
 +  fail with ENXIO.
 +
 +- Attempting to create a DRM lease on a disappeared DRM device will
 +  fail with ENODEV. Existing DRM leases remain and work as listed
 +  above.
 +
 +Requirements for Render and Cross-Device UAPI
 +---------------------------------------------
 +
 +- All GPU jobs that can no longer run must have their fences
 +  force-signalled to avoid inflicting hangs on userspace.
 +  The associated error code is ENODEV.
 +
 +- Some userspace APIs already define what should happen when the device
 +  disappears (OpenGL, GL ES: `GL_KHR_robustness`_; `Vulkan`_:
 +  VK_ERROR_DEVICE_LOST; etc.). DRM drivers are free to implement this
 +  behaviour the way they see best, e.g. returning failures in
 +  driver-specific ioctls and handling those in userspace drivers, or
 +  rely on uevents, and so on.
 +
 +- dmabuf which point to memory that has disappeared will either fail to
 +  import with ENODEV or continue to be successfully imported if it would
 +  have succeeded before the disappearance. See also about memory maps
 +  below for already imported dmabufs.
 +
 +- Attempting to import a dmabuf to a disappeared device will either fail
 +  with ENODEV or succeed if it would have succeeded without the
 +  disappearance.
 +
 +- open() on a device node whose underlying device has disappeared will
 +  fail with ENXIO.
 +
 +.. _GL_KHR_robustness: https://www.khronos.org/registry/OpenGL/extensions/KHR/KHR_robustness.txt
 +.. _Vulkan: https://www.khronos.org/vulkan/
 +
 +Requirements for Memory Maps
 +----------------------------
 +
 +Memory maps have further requirements that apply to both existing maps
 +and maps created after the device has disappeared. If the underlying
 +memory disappears, the map is created or modified such that reads and
 +writes will still complete successfully but the result is undefined.
 +This applies to both userspace mmap()'d memory and memory pointed to by
 +dmabuf which might be mapped to other devices (cross-device dmabuf
 +imports).
 +
 +Raising SIGBUS is not an option, because userspace cannot realistically
 +handle it. Signal handlers are global, which makes them extremely
 +difficult to use correctly from libraries like those that Mesa produces.
 +Signal handlers are not composable, you can't have different handlers
 +for GPU1 and GPU2 from different vendors, and a third handler for
 +mmapped regular files. Threads cause additional pain with signal
 +handling as well.
 +
  .. _drm_driver_ioctl:
  
  IOCTL Support on Device Nodes
@@@ -307,11 -195,11 +307,11 @@@ ENOSPC
  EPERM/EACCES:
          Returned for an operation that is valid, but needs more privileges.
          E.g. root-only or much more common, DRM master-only operations return
-         this when when called by unpriviledged clients. There's no clear
+         this when called by unpriviledged clients. There's no clear
          difference between EACCES and EPERM.
  
  ENODEV:
 -        The device is not (yet) present or fully initialized.
 +        The device is not present anymore or is not yet fully initialized.
  
  EOPNOTSUPP:
          Feature (like PRIME, modesetting, GEM) is not supported by the driver.

diff --combined MAINTAINERS
index dfbd5df0b8b77f85a584b4158fc0dd96a61a3ea3,deaafb617361c7ecb212620b1deac942f03588f1..9e1873182f2ee97fde1116301bed5eb154f8a615
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -147,7 -147,7 +147,7 @@@ Maintainers Lis
  M:    Steffen Klassert <[email protected]>
  L:    [email protected]
  S:    Odd Fixes
- F:    Documentation/networking/device_drivers/3com/vortex.rst
+ F:    Documentation/networking/device_drivers/ethernet/3com/vortex.rst
  F:    drivers/net/ethernet/3com/3c59x.c
  
  3CR990 NETWORK DRIVER
@@@ -816,7 -816,7 +816,7 @@@ R: Saeed Bishara <[email protected]
  R:    Zorik Machulsky <[email protected]>
  L:    [email protected]
  S:    Supported
- F:    Documentation/networking/device_drivers/amazon/ena.rst
+ F:    Documentation/networking/device_drivers/ethernet/amazon/ena.rst
  F:    drivers/net/ethernet/amazon/
  
  AMAZON RDMA EFA DRIVER
@@@ -830,11 -830,20 +830,20 @@@ F:      include/uapi/rdma/efa-abi.
  
  AMD CRYPTOGRAPHIC COPROCESSOR (CCP) DRIVER
  M:    Tom Lendacky <[email protected]>
+ M:    John Allen <[email protected]>
  L:    [email protected]
  S:    Supported
  F:    drivers/crypto/ccp/
  F:    include/linux/ccp.h
  
+ AMD CRYPTOGRAPHIC COPROCESSOR (CCP) DRIVER - SEV SUPPORT
+ M:    Brijesh Singh <[email protected]>
+ M:    Tom Lendacky <[email protected]>
+ L:    [email protected]
+ S:    Supported
+ F:    drivers/crypto/ccp/sev*
+ F:    include/uapi/linux/psp-sev.h
+ 
  AMD DISPLAY CORE
  M:    Harry Wentland <[email protected]>
  M:    Leo Li <[email protected]>
@@@ -1073,6 -1082,7 +1082,7 @@@ L:      [email protected]
  S:    Supported
  W:    http://ez.analog.com/community/linux-device-drivers
  F:    drivers/media/i2c/adv7180.c
+ F:    Documentation/devicetree/bindings/media/i2c/adv7180.yaml
  
  ANALOG DEVICES INC ADV748X DRIVER
  M:    Kieran Bingham <[email protected]>
@@@ -1170,6 -1180,8 +1180,8 @@@ M:      Todd Kjos <[email protected]
  M:    Martijn Coenen <[email protected]>
  M:    Joel Fernandes <[email protected]>
  M:    Christian Brauner <[email protected]>
+ M:    Hridya Valsaraju <[email protected]>
+ M:    Suren Baghdasaryan <[email protected]>
  L:    [email protected]
  S:    Supported
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git
@@@ -1295,7 -1307,7 +1307,7 @@@ L:      [email protected]
  S:    Supported
  W:    https://www.marvell.com/
  Q:    http://patchwork.ozlabs.org/project/netdev/list/
- F:    Documentation/networking/device_drivers/aquantia/atlantic.rst
+ F:    Documentation/networking/device_drivers/ethernet/aquantia/atlantic.rst
  F:    drivers/net/ethernet/aquantia/atlantic/
  
  AQUANTIA ETHERNET DRIVER PTP SUBSYSTEM
@@@ -1484,7 -1496,7 +1496,7 @@@ ARM SMC WATCHDOG DRIVE
  M:    Julius Werner <[email protected]>
  R:    Evan Benn <[email protected]>
  S:    Maintained
- F:    devicetree/bindings/watchdog/arm-smc-wdt.yaml
+ F:    Documentation/devicetree/bindings/watchdog/arm-smc-wdt.yaml
  F:    drivers/watchdog/arm_smc_wdt.c
  
  ARM SMMU DRIVERS
@@@ -1493,7 -1505,7 +1505,7 @@@ R:      Robin Murphy <[email protected]
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
  F:    Documentation/devicetree/bindings/iommu/arm,smmu*
- F:    drivers/iommu/arm-smmu*
+ F:    drivers/iommu/arm/
  F:    drivers/iommu/io-pgtable-arm-v7s.c
  F:    drivers/iommu/io-pgtable-arm.c
  
@@@ -1528,6 -1540,7 +1540,7 @@@ F:      drivers/mmc/host/owl-mmc.
  F:    drivers/pinctrl/actions/*
  F:    drivers/soc/actions/
  F:    include/dt-bindings/power/owl-*
+ F:    include/dt-bindings/reset/actions,*
  F:    include/linux/soc/actions/
  N:    owl
  
@@@ -1592,6 -1605,9 +1605,9 @@@ F:      sound/soc/meson
  
  ARM/Amlogic Meson SoC support
  M:    Kevin Hilman <[email protected]>
+ R:    Neil Armstrong <[email protected]>
+ R:    Jerome Brunet <[email protected]>
+ R:    Martin Blumenstingl <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  L:    [email protected]
  S:    Maintained
@@@ -1612,7 -1628,7 +1628,7 @@@ L:      [email protected]
  S:    Maintained
  F:    arch/arm/boot/dts/alpine*
  F:    arch/arm/mach-alpine/
- F:    arch/arm64/boot/dts/al/
+ F:    arch/arm64/boot/dts/amazon/
  F:    drivers/*/*alpine*
  
  ARM/ARTPEC MACHINE SUPPORT
@@@ -1949,6 -1965,14 +1965,14 @@@ F:    drivers/irqchip/irq-ixp4xx.
  F:    include/linux/irqchip/irq-ixp4xx.h
  F:    include/linux/platform_data/timer-ixp4xx.h
  
+ ARM/INTEL KEEMBAY ARCHITECTURE
+ M:    Paul J. Murphy <[email protected]>
+ M:    Daniele Alessandrelli <[email protected]>
+ S:    Maintained
+ F:    Documentation/devicetree/bindings/arm/intel,keembay.yaml
+ F:    arch/arm64/boot/dts/intel/keembay-evm.dts
+ F:    arch/arm64/boot/dts/intel/keembay-soc.dtsi
+ 
  ARM/INTEL RESEARCH IMOTE/STARGATE 2 MACHINE SUPPORT
  M:    Jonathan Cameron <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
@@@ -2106,12 -2130,32 +2130,32 @@@ X:   drivers/net/wireless/atmel
  N:    at91
  N:    atmel
  
+ ARM/Microchip Sparx5 SoC support
+ M:    Lars Povlsen <[email protected]>
+ M:    Steen Hegelund <[email protected]>
+ M:    Microchip Linux Driver Support <[email protected]>
+ L:    [email protected] (moderated for non-subscribers)
+ S:    Supported
+ F:    arch/arm64/boot/dts/microchip/
+ N:    sparx5
+ 
  ARM/MIOA701 MACHINE SUPPORT
  M:    Robert Jarzmik <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
  F:    arch/arm/mach-pxa/mioa701.c
  
+ ARM/MStar/Sigmastar Armv7 SoC support
+ M:    Daniel Palmer <[email protected]>
+ L:    [email protected] (moderated for non-subscribers)
+ S:    Maintained
+ W:    http://linux-chenxing.org/
+ F:    Documentation/devicetree/bindings/arm/mstar/*
+ F:    arch/arm/boot/dts/infinity*.dtsi
+ F:    arch/arm/boot/dts/mercury*.dtsi
+ F:    arch/arm/boot/dts/mstar-v7.dtsi
+ F:    arch/arm/mach-mstar/
+ 
  ARM/NEC MOBILEPRO 900/c MACHINE SUPPORT
  M:    Michael Petchkovsky <[email protected]>
  S:    Maintained
@@@ -2266,7 -2310,7 +2310,7 @@@ F:      drivers/pci/controller/dwc/pcie-qcom
  F:    drivers/phy/qualcomm/
  F:    drivers/power/*/msm*
  F:    drivers/reset/reset-qcom-*
- F:    drivers/scsi/ufs/ufs-qcom.*
+ F:    drivers/scsi/ufs/ufs-qcom*
  F:    drivers/spi/spi-geni-qcom.c
  F:    drivers/spi/spi-qcom-qspi.c
  F:    drivers/spi/spi-qup.c
@@@ -2822,7 -2866,7 +2866,7 @@@ ASYMMETRIC KEY
  M:    David Howells <[email protected]>
  L:    [email protected]
  S:    Maintained
- F:    Documentation/crypto/asymmetric-keys.txt
+ F:    Documentation/crypto/asymmetric-keys.rst
  F:    crypto/asymmetric_keys/
  F:    include/crypto/pkcs7.h
  F:    include/crypto/public_key.h
@@@ -2832,7 -2876,7 +2876,7 @@@ ASYNCHRONOUS TRANSFERS/TRANSFORMS (IOAT
  R:    Dan Williams <[email protected]>
  S:    Odd fixes
  W:    http://sourceforge.net/projects/xscaleiop
- F:    Documentation/crypto/async-tx-api.txt
+ F:    Documentation/crypto/async-tx-api.rst
  F:    crypto/async_tx/
  F:    drivers/dma/
  F:    include/linux/async_tx.h
@@@ -2876,7 -2920,7 +2920,7 @@@ S:      Supporte
  F:    drivers/net/wireless/ath/*
  
  ATHEROS ATH5K WIRELESS DRIVER
- M:    Jiri Slaby <jirislaby@gmail.com>
+ M:    Jiri Slaby <jirislaby@kernel.org>
  M:    Nick Kossifidis <[email protected]>
  M:    Luis Chamberlain <[email protected]>
  L:    [email protected]
@@@ -3578,6 -3622,7 +3622,7 @@@ M:      Selvin Xavier <selvin.xavier@broadco
  M:    Devesh Sharma <[email protected]>
  M:    Somnath Kotur <[email protected]>
  M:    Sriharsha Basavapatna <[email protected]>
+ M:    Naresh Kumar PBS <[email protected]>
  L:    [email protected]
  S:    Supported
  W:    http://www.broadcom.com
@@@ -4097,6 -4142,14 +4142,14 @@@ F:    drivers/power/supply/cros_usbpd-char
  N:    cros_ec
  N:    cros-ec
  
+ CHRONTEL CH7322 CEC DRIVER
+ M:    Jeff Chase <[email protected]>
+ L:    [email protected]
+ S:    Maintained
+ T:    git git://linuxtv.org/media_tree.git
+ F:    Documentation/devicetree/bindings/media/i2c/chrontel,ch7322.yaml
+ F:    drivers/media/cec/i2c/ch7322.c
+ 
  CIRRUS LOGIC AUDIO CODEC DRIVERS
  M:    James Schulman <[email protected]>
  M:    David Rhodes <[email protected]>
@@@ -4343,6 -4396,12 +4396,12 @@@ L:    [email protected]
  S:    Maintained
  F:    drivers/connector/
  
+ CONSOLE SUBSYSTEM
+ M:    Greg Kroah-Hartman <[email protected]>
+ S:    Supported
+ F:    drivers/video/console/
+ F:    include/linux/console*
+ 
  CONTROL GROUP (CGROUP)
  M:    Tejun Heo <[email protected]>
  M:    Li Zefan <[email protected]>
@@@ -4396,6 -4455,12 +4455,12 @@@ S:    Maintaine
  F:    Documentation/hwmon/coretemp.rst
  F:    drivers/hwmon/coretemp.c
  
+ CORSAIR-CPRO HARDWARE MONITOR DRIVER
+ M:    Marius Zachmann <[email protected]>
+ L:    [email protected]
+ S:    Maintained
+ F:    drivers/hwmon/corsair-cpro.c
+ 
  COSA/SRP SYNC SERIAL DRIVER
  M:    Jan "Yenya" Kasprzak <[email protected]>
  S:    Maintained
@@@ -4749,7 -4814,7 +4814,7 @@@ F:      net/ax25/sysctl_net_ax25.
  DAVICOM FAST ETHERNET (DMFE) NETWORK DRIVER
  L:    [email protected]
  S:    Orphan
- F:    Documentation/networking/device_drivers/dec/dmfe.rst
+ F:    Documentation/networking/device_drivers/ethernet/dec/dmfe.rst
  F:    drivers/net/ethernet/dec/tulip/dmfe.c
  
  DC390/AM53C974 SCSI driver
@@@ -5211,6 -5276,14 +5276,14 @@@ T:    git git://linuxtv.org/media_tree.gi
  F:    Documentation/devicetree/bindings/media/i2c/dongwoon,dw9714.txt
  F:    drivers/media/i2c/dw9714.c
  
+ DONGWOON DW9768 LENS VOICE COIL DRIVER
+ M:    Dongchun Zhu <[email protected]>
+ L:    [email protected]
+ S:    Maintained
+ T:    git git://linuxtv.org/media_tree.git
+ F:    Documentation/devicetree/bindings/media/i2c/dongwoon,dw9768.yaml
+ F:    drivers/media/i2c/dw9768.c
+ 
  DONGWOON DW9807 LENS VOICE COIL DRIVER
  M:    Sakari Ailus <[email protected]>
  L:    [email protected]
@@@ -5237,8 -5310,8 +5310,8 @@@ M:      Ioana Ciornei <[email protected]
  M:    Ioana Radulescu <[email protected]>
  L:    [email protected]
  S:    Maintained
- F:    Documentation/networking/device_drivers/freescale/dpaa2/ethernet-driver.rst
- F:    Documentation/networking/device_drivers/freescale/dpaa2/mac-phy-support.rst
+ F:    Documentation/networking/device_drivers/ethernet/freescale/dpaa2/ethernet-driver.rst
+ F:    Documentation/networking/device_drivers/ethernet/freescale/dpaa2/mac-phy-support.rst
  F:    drivers/net/ethernet/freescale/dpaa2/Kconfig
  F:    drivers/net/ethernet/freescale/dpaa2/Makefile
  F:    drivers/net/ethernet/freescale/dpaa2/dpaa2-eth*
@@@ -5406,7 -5479,7 +5479,7 @@@ S:      Orphan / Obsolet
  F:    drivers/gpu/drm/mga/
  F:    include/uapi/drm/mga_drm.h
  
 -DRM DRIVER FOR MGA G200 SERVER GRAPHICS CHIPS
 +DRM DRIVER FOR MGA G200 GRAPHICS CHIPS
  M:    Dave Airlie <[email protected]>
  S:    Odd Fixes
  F:    drivers/gpu/drm/mgag200/
@@@ -5694,7 -5767,7 +5767,7 @@@ F:      drivers/gpu/drm/gma500
  
  DRM DRIVERS FOR HISILICON
  M:    Xinliang Liu <[email protected]>
 -M:    Rongrong Zou <zourongrong@gmail.com>
 +M:    Tian Tao  <tiantao6@hisilicon.com>
  R:    John Stultz <[email protected]>
  R:    Xinwei Kong <[email protected]>
  R:    Chen Feng <[email protected]>
@@@ -6976,6 -7049,13 +7049,13 @@@ L:    [email protected]
  S:    Maintained
  F:    drivers/usb/gadget/udc/fsl*
  
+ FREESCALE USB PHY DRIVER
+ M:    Ran Wang <[email protected]>
+ L:    [email protected]
+ L:    [email protected]
+ S:    Maintained
+ F:    drivers/usb/phy/phy-fsl-usb*
+ 
  FREEVXFS FILESYSTEM
  M:    Christoph Hellwig <[email protected]>
  S:    Maintained
@@@ -7112,7 -7192,7 +7192,7 @@@ F:      include/linux/futex.
  F:    include/uapi/linux/futex.h
  F:    kernel/futex.c
  F:    tools/perf/bench/futex*
- F:    Documentation/locking/*futex*
+ F:    tools/testing/selftests/futex/
  
  GATEWORKS SYSTEM CONTROLLER (GSC) DRIVER
  M:    Tim Harvey <[email protected]>
@@@ -7308,7 -7388,7 +7388,7 @@@ R:      Sagi Shahar <[email protected]
  R:    Jon Olson <[email protected]>
  L:    [email protected]
  S:    Supported
- F:    Documentation/networking/device_drivers/google/gve.rst
+ F:    Documentation/networking/device_drivers/ethernet/google/gve.rst
  F:    drivers/net/ethernet/google
  
  GPD POCKET FAN DRIVER
@@@ -7919,7 -7999,7 +7999,7 @@@ HUAWEI ETHERNET DRIVE
  M:    Bin Luo <[email protected]>
  L:    [email protected]
  S:    Supported
- F:    Documentation/networking/hinic.rst
+ F:    Documentation/networking/device_drivers/ethernet/huawei/hinic.rst
  F:    drivers/net/ethernet/huawei/hinic/
  
  HUGETLB FILESYSTEM
@@@ -7971,7 -8051,7 +8051,7 @@@ S:      Supporte
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git
  F:    Documentation/ABI/stable/sysfs-bus-vmbus
  F:    Documentation/ABI/testing/debugfs-hyperv
- F:    Documentation/networking/device_drivers/microsoft/netvsc.rst
+ F:    Documentation/networking/device_drivers/ethernet/microsoft/netvsc.rst
  F:    arch/x86/hyperv
  F:    arch/x86/include/asm/hyperv-tlfs.h
  F:    arch/x86/include/asm/mshyperv.h
@@@ -8330,8 -8410,9 +8410,9 @@@ W:      https://github.com/o2genum/ideapad-s
  F:    drivers/input/misc/ideapad_slidebar.c
  
  IDT VersaClock 5 CLOCK DRIVER
- M:    Marek Vasut <[email protected]>
+ M:    Luca Ceresoli <[email protected]>
  S:    Maintained
+ F:    Documentation/devicetree/bindings/clock/idt,versaclock5.yaml
  F:    drivers/clk/clk-versaclock5.c
  
  IEEE 802.15.4 SUBSYSTEM
@@@ -8606,6 -8687,12 +8687,12 @@@ L:    [email protected]
  S:    Maintained
  F:    drivers/platform/x86/intel_atomisp2_pm.c
  
+ INTEL ATOMISP2 LED DRIVER
+ M:    Hans de Goede <[email protected]>
+ L:    [email protected]
+ S:    Maintained
+ F:    drivers/platform/x86/intel_atomisp2_led.c
+ 
  INTEL BROXTON PMC DRIVER
  M:    Mika Westerberg <[email protected]>
  M:    Zha Qipeng <[email protected]>
@@@ -8653,18 -8740,7 +8740,7 @@@ W:     http://e1000.sourceforge.net
  Q:    http://patchwork.ozlabs.org/project/intel-wired-lan/list/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-queue.git
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/next-queue.git
- F:    Documentation/networking/device_drivers/intel/e100.rst
- F:    Documentation/networking/device_drivers/intel/e1000.rst
- F:    Documentation/networking/device_drivers/intel/e1000e.rst
- F:    Documentation/networking/device_drivers/intel/fm10k.rst
- F:    Documentation/networking/device_drivers/intel/i40e.rst
- F:    Documentation/networking/device_drivers/intel/iavf.rst
- F:    Documentation/networking/device_drivers/intel/ice.rst
- F:    Documentation/networking/device_drivers/intel/igb.rst
- F:    Documentation/networking/device_drivers/intel/igbvf.rst
- F:    Documentation/networking/device_drivers/intel/ixgb.rst
- F:    Documentation/networking/device_drivers/intel/ixgbe.rst
- F:    Documentation/networking/device_drivers/intel/ixgbevf.rst
+ F:    Documentation/networking/device_drivers/ethernet/intel/
  F:    drivers/net/ethernet/intel/
  F:    drivers/net/ethernet/intel/*/
  F:    include/linux/avf/virtchnl.h
@@@ -8792,7 -8868,7 +8868,7 @@@ M:      Tomas Winkler <[email protected]
  L:    [email protected]
  S:    Supported
  F:    Documentation/driver-api/mei/*
- F:    drivers/misc/mei/*
+ F:    drivers/misc/mei/
  F:    drivers/watchdog/mei_wdt.c
  F:    include/linux/mei_cl_bus.h
  F:    include/uapi/linux/mei.h
@@@ -8854,8 -8930,8 +8930,8 @@@ INTEL PRO/WIRELESS 2100, 2200BG, 2915AB
  M:    Stanislav Yakovlev <[email protected]>
  L:    [email protected]
  S:    Maintained
- F:    Documentation/networking/device_drivers/intel/ipw2100.rst
- F:    Documentation/networking/device_drivers/intel/ipw2200.rst
+ F:    Documentation/networking/device_drivers/wifi/intel/ipw2100.rst
+ F:    Documentation/networking/device_drivers/wifi/intel/ipw2200.rst
  F:    drivers/net/wireless/intel/ipw2x00/
  
  INTEL PSTATE DRIVER
@@@ -8985,6 -9061,14 +9061,14 @@@ F:    include/dt-bindings/interconnect
  F:    include/linux/interconnect-provider.h
  F:    include/linux/interconnect.h
  
+ INVENSENSE ICM-426xx IMU DRIVER
+ M:    Jean-Baptiste Maneyrol <[email protected]>
+ L:    [email protected]
+ S:    Maintained
+ W     https://invensense.tdk.com/
+ F:    Documentation/devicetree/bindings/iio/imu/invensense,icm42600.yaml
+ F:    drivers/iio/imu/inv_icm42600/
+ 
  INVENSENSE MPU-3050 GYROSCOPE DRIVER
  M:    Linus Walleij <[email protected]>
  L:    [email protected]
@@@ -9020,6 -9104,7 +9104,7 @@@ F:      drivers/iommu
  F:    include/linux/iommu.h
  F:    include/linux/iova.h
  F:    include/linux/of_iommu.h
+ F:    include/uapi/linux/iommu.h
  
  IO_URING
  M:    Jens Axboe <[email protected]>
@@@ -9458,9 -9543,11 +9543,11 @@@ F:    arch/arm64/kvm
  F:    include/kvm/arm_*
  
  KERNEL VIRTUAL MACHINE FOR MIPS (KVM/mips)
+ M:    Huacai Chen <[email protected]>
+ M:    Aleksandar Markovic <[email protected]>
  L:    [email protected]
  L:    [email protected]
- S:    Orphan
+ S:    Maintained
  F:    arch/mips/include/asm/kvm*
  F:    arch/mips/include/uapi/asm/kvm*
  F:    arch/mips/kvm/
@@@ -9591,6 -9678,15 +9678,15 @@@ F:    include/linux/kdb.
  F:    include/linux/kgdb.h
  F:    kernel/debug/
  
+ KHADAS MCU MFD DRIVER
+ M:    Neil Armstrong <[email protected]>
+ L:    [email protected]
+ S:    Maintained
+ F:    Documentation/devicetree/bindings/mfd/khadas,mcu.yaml
+ F:    drivers/mfd/khadas-mcu.c
+ F:    include/linux/mfd/khadas-mcu.h
+ F:    drivers/thermal/khadas_mcu_fan.c
+ 
  KMEMLEAK
  M:    Catalin Marinas <[email protected]>
  S:    Maintained
@@@ -9614,7 -9710,7 +9710,7 @@@ M:      Anil S Keshavamurthy <anil.s.keshava
  M:    "David S. Miller" <[email protected]>
  M:    Masami Hiramatsu <[email protected]>
  S:    Maintained
- F:    Documentation/kprobes.txt
+ F:    Documentation/trace/kprobes.rst
  F:    include/asm-generic/kprobes.h
  F:    include/linux/kprobes.h
  F:    kernel/kprobes.c
@@@ -9686,12 -9782,10 +9782,10 @@@ T:   git git://git.kernel.org/pub/scm/lin
  F:    scripts/leaking_addresses.pl
  
  LED SUBSYSTEM
- M:    Jacek Anaszewski <[email protected]>
  M:    Pavel Machek <[email protected]>
  R:    Dan Murphy <[email protected]>
  L:    [email protected]
  S:    Maintained
- T:    git git://git.kernel.org/pub/scm/linux/kernel/git/j.anaszewski/linux-leds.git
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/pavel/linux-leds.git
  F:    Documentation/devicetree/bindings/leds/
  F:    drivers/leds/
@@@ -9977,6 -10071,7 +10071,7 @@@ M:    Luc Maranget <[email protected]
  M:    "Paul E. McKenney" <[email protected]>
  R:    Akira Yokosawa <[email protected]>
  R:    Daniel Lustig <[email protected]>
+ R:    Joel Fernandes <[email protected]>
  L:    [email protected]
  L:    [email protected]
  S:    Supported
@@@ -9985,6 -10080,7 +10080,7 @@@ F:    Documentation/atomic_bitops.tx
  F:    Documentation/atomic_t.txt
  F:    Documentation/core-api/atomic_ops.rst
  F:    Documentation/core-api/refcount-vs-atomic.rst
+ F:    Documentation/litmus-tests/
  F:    Documentation/memory-barriers.txt
  F:    tools/memory-model/
  
@@@ -10379,7 -10475,7 +10475,7 @@@ M:   Geetha sowjanya <[email protected]
  M:    Jerin Jacob <[email protected]>
  L:    [email protected]
  S:    Supported
- F:    Documentation/networking/device_drivers/marvell/octeontx2.rst
+ F:    Documentation/networking/device_drivers/ethernet/marvell/octeontx2.rst
  F:    drivers/net/ethernet/marvell/octeontx2/af/
  
  MARVELL SOC MMC/SD/SDIO CONTROLLER DRIVER
@@@ -10439,6 -10535,16 +10535,16 @@@ F: Documentation/hwmon/max6697.rs
  F:    drivers/hwmon/max6697.c
  F:    include/linux/platform_data/max6697.h
  
+ MAX9286 QUAD GMSL DESERIALIZER DRIVER
+ M:    Jacopo Mondi <[email protected]>
+ M:    Kieran Bingham <[email protected]>
+ M:    Laurent Pinchart <[email protected]>
+ M:    Niklas Söderlund <[email protected]>
+ L:    [email protected]
+ S:    Maintained
+ F:    Documentation/devicetree/bindings/media/i2c/maxim,max9286.yaml
+ F:    drivers/media/i2c/max9286.c
+ 
  MAX9860 MONO AUDIO VOICE CODEC DRIVER
  M:    Peter Rosin <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
@@@ -10717,7 -10823,7 +10823,7 @@@ L:   [email protected]
  L:    [email protected]
  S:    Supported
  T:    git git://linuxtv.org/media_tree.git
- F:    Documentation/devicetree/bindings/media/renesas,fcp.txt
+ F:    Documentation/devicetree/bindings/media/renesas,fcp.yaml
  F:    drivers/media/platform/rcar-fcp.c
  F:    include/media/rcar-fcp.h
  
@@@ -10727,7 -10833,7 +10833,7 @@@ L:   [email protected]
  L:    [email protected]
  S:    Supported
  T:    git git://linuxtv.org/media_tree.git
- F:    Documentation/devicetree/bindings/media/renesas,fdp1.txt
+ F:    Documentation/devicetree/bindings/media/renesas,fdp1.yaml
  F:    drivers/media/platform/rcar_fdp1.c
  
  MEDIA DRIVERS FOR RENESAS - VIN
@@@ -10747,7 -10853,7 +10853,7 @@@ L:   [email protected]
  L:    [email protected]
  S:    Supported
  T:    git git://linuxtv.org/media_tree.git
- F:    Documentation/devicetree/bindings/media/renesas,vsp1.txt
+ F:    Documentation/devicetree/bindings/media/renesas,vsp1.yaml
  F:    drivers/media/platform/vsp1/
  
  MEDIA DRIVERS FOR ST STV0910 DEMODULATOR ICs
@@@ -11048,7 -11154,7 +11154,7 @@@ L:   [email protected]
  S:    Supported
  W:    http://www.mellanox.com
  Q:    http://patchwork.ozlabs.org/project/netdev/list/
- F:    Documentation/networking/device_drivers/mellanox/
+ F:    Documentation/networking/device_drivers/ethernet/mellanox/
  F:    drivers/net/ethernet/mellanox/mlx5/core/
  F:    include/linux/mlx5/
  
@@@ -11102,6 -11208,23 +11208,23 @@@ F: Documentation/core-api/boot-time-mm.
  F:    include/linux/memblock.h
  F:    mm/memblock.c
  
+ MEMORY CONTROLLER DRIVERS
+ M:    Krzysztof Kozlowski <[email protected]>
+ L:    [email protected]
+ S:    Maintained
+ T:    git git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl.git
+ F:    Documentation/devicetree/bindings/memory-controllers/
+ F:    drivers/memory/
+ 
+ MEMORY FREQUENCY SCALING DRIVERS FOR NVIDIA TEGRA
+ M:    Dmitry Osipenko <[email protected]>
+ L:    [email protected]
+ L:    [email protected]
+ T:    git git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/linux.git
+ S:    Maintained
+ F:    drivers/devfreq/tegra20-devfreq.c
+ F:    drivers/devfreq/tegra30-devfreq.c
+ 
  MEMORY MANAGEMENT
  M:    Andrew Morton <[email protected]>
  L:    [email protected]
@@@ -11211,6 -11334,19 +11334,19 @@@ W: http://www.monstr.eu/fdt
  T:    git git://git.monstr.eu/linux-2.6-microblaze.git
  F:    arch/microblaze/
  
+ MICROCHIP AT91 DMA DRIVERS
+ M:    Ludovic Desroches <[email protected]>
+ M:    Tudor Ambarus <[email protected]>
+ L:    [email protected] (moderated for non-subscribers)
+ L:    [email protected]
+ S:    Supported
+ F:    Documentation/devicetree/bindings/dma/atmel-dma.txt
+ F:    drivers/dma/at_hdmac.c
+ F:    drivers/dma/at_hdmac_regs.h
+ F:    drivers/dma/at_xdmac.c
+ F:    include/dt-bindings/dma/at91.h
+ F:    include/linux/platform_data/dma-atmel.h
+ 
  MICROCHIP AT91 SERIAL DRIVER
  M:    Richard Genoud <[email protected]>
  S:    Maintained
@@@ -11239,17 -11375,6 +11375,6 @@@ L:  [email protected] (moderat
  S:    Supported
  F:    sound/soc/atmel
  
- MICROCHIP DMA DRIVER
- M:    Ludovic Desroches <[email protected]>
- L:    [email protected] (moderated for non-subscribers)
- L:    [email protected]
- S:    Supported
- F:    Documentation/devicetree/bindings/dma/atmel-dma.txt
- F:    drivers/dma/at_hdmac.c
- F:    drivers/dma/at_hdmac_regs.h
- F:    include/dt-bindings/dma/at91.h
- F:    include/linux/platform_data/dma-atmel.h
- 
  MICROCHIP ECC DRIVER
  M:    Tudor Ambarus <[email protected]>
  L:    [email protected]
@@@ -11341,7 -11466,6 +11466,6 @@@ F:   Documentation/devicetree/bindings/pw
  F:    drivers/pwm/pwm-atmel.c
  
  MICROCHIP SAMA5D2-COMPATIBLE ADC DRIVER
- M:    Ludovic Desroches <[email protected]>
  M:    Eugen Hristev <[email protected]>
  L:    [email protected]
  S:    Supported
@@@ -11379,12 -11503,12 +11503,12 @@@ L:        [email protected]
  S:    Supported
  F:    drivers/usb/gadget/udc/atmel_usba_udc.*
  
- MICROCHIP XDMA DRIVER
- M:    Ludovic Desroches <ludovic.desroches@microchip.com>
- L:    [email protected]
- L:    dmaengine@vger.kernel.org
+ MICROCHIP WILC1000 WIFI DRIVER
+ M:    Ajay Singh <ajay.kathat@microchip.com>
+ M:    Claudiu Beznea <[email protected]>
+ L:    linux-wireless@vger.kernel.org
  S:    Supported
- F:    drivers/dma/at_xdmac.c
+ F:    drivers/net/wireless/microchip/wilc1000/
  
  MICROSEMI MIPS SOCS
  M:    Alexandre Belloni <[email protected]>
@@@ -11441,6 -11565,17 +11565,17 @@@ F: arch/mips/configs/generic/board-bost
  F:    drivers/clk/imgtec/clk-boston.c
  F:    include/dt-bindings/clock/boston-clock.h
  
+ MIPS CORE DRIVERS
+ M:    Thomas Bogendoerfer <[email protected]>
+ M:    Serge Semin <[email protected]>
+ L:    [email protected]
+ S:    Supported
+ F:    drivers/bus/mips_cdmm.c
+ F:    drivers/clocksource/mips-gic-timer.c
+ F:    drivers/cpuidle/cpuidle-cps.c
+ F:    drivers/irqchip/irq-mips-cpu.c
+ F:    drivers/irqchip/irq-mips-gic.c
+ 
  MIPS GENERIC PLATFORM
  M:    Paul Burton <[email protected]>
  L:    [email protected]
@@@ -11569,7 -11704,7 +11704,7 @@@ F:   drivers/media/pci/meye
  F:    include/uapi/linux/meye.h
  
  MOXA SMARTIO/INDUSTIO/INTELLIO SERIAL CARD
- M:    Jiri Slaby <jirislaby@gmail.com>
+ M:    Jiri Slaby <jirislaby@kernel.org>
  S:    Maintained
  F:    Documentation/driver-api/serial/moxa-smartio.rst
  F:    drivers/tty/mxser.*
@@@ -11823,8 -11958,8 +11958,8 @@@ NETERION 10GbE DRIVERS (s2io/vxge
  M:    Jon Mason <[email protected]>
  L:    [email protected]
  S:    Supported
- F:    Documentation/networking/device_drivers/neterion/s2io.rst
- F:    Documentation/networking/device_drivers/neterion/vxge.rst
+ F:    Documentation/networking/device_drivers/ethernet/neterion/s2io.rst
+ F:    Documentation/networking/device_drivers/ethernet/neterion/vxge.rst
  F:    drivers/net/ethernet/neterion/
  
  NETFILTER
@@@ -11860,7 -11995,8 +11995,8 @@@ F:   include/uapi/linux/netrom.
  F:    net/netrom/
  
  NETRONOME ETHERNET DRIVERS
- M:    Jakub Kicinski <[email protected]>
+ M:    Simon Horman <[email protected]>
+ R:    Jakub Kicinski <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    drivers/net/ethernet/netronome/
@@@ -12269,6 -12405,7 +12405,7 @@@ F:   drivers/nvme/target
  NVMEM FRAMEWORK
  M:    Srinivas Kandagatla <[email protected]>
  S:    Maintained
+ T:    git git://git.kernel.org/pub/scm/linux/kernel/git/srini/nvmem.git
  F:    Documentation/ABI/stable/sysfs-bus-nvmem
  F:    Documentation/devicetree/bindings/nvmem/
  F:    drivers/nvmem/
@@@ -12714,6 -12851,7 +12851,7 @@@ OP-TEE DRIVE
  M:    Jens Wiklander <[email protected]>
  L:    [email protected]
  S:    Maintained
+ F:    Documentation/ABI/testing/sysfs-bus-optee-devices
  F:    drivers/tee/optee/
  
  OP-TEE RANDOM NUMBER GENERATOR (RNG) DRIVER
@@@ -13170,12 -13308,14 +13308,14 @@@ S:        Maintaine
  F:    Documentation/devicetree/bindings/pci/designware-pcie.txt
  F:    drivers/pci/controller/dwc/*designware*
  
- PCI DRIVER FOR TI DRA7XX
+ PCI DRIVER FOR TI DRA7XX/J721E
  M:    Kishon Vijay Abraham I <[email protected]>
  L:    [email protected]
  L:    [email protected]
+ L:    [email protected]
  S:    Supported
  F:    Documentation/devicetree/bindings/pci/ti-pci.txt
+ F:    drivers/pci/controller/cadence/pci-j721e.c
  F:    drivers/pci/controller/dwc/pci-dra7xx.c
  
  PCI DRIVER FOR TI KEYSTONE
@@@ -13204,7 -13344,6 +13344,6 @@@ F:   tools/pci
  
  PCI ENHANCED ERROR HANDLING (EEH) FOR POWERPC
  M:    Russell Currey <[email protected]>
- M:    Sam Bobroff <[email protected]>
  M:    Oliver O'Halloran <[email protected]>
  L:    [email protected]
  S:    Supported
@@@ -13387,7 -13526,7 +13526,7 @@@ M:   Shannon Nelson <[email protected]
  M:    Pensando Drivers <[email protected]>
  L:    [email protected]
  S:    Supported
- F:    Documentation/networking/device_drivers/pensando/ionic.rst
+ F:    Documentation/networking/device_drivers/ethernet/pensando/ionic.rst
  F:    drivers/net/ethernet/pensando/
  
  PER-CPU MEMORY ALLOCATOR
@@@ -13427,6 -13566,7 +13566,7 @@@ F:   arch/*/kernel/perf_event*.
  F:    include/linux/perf_event.h
  F:    include/uapi/linux/perf_event.h
  F:    kernel/events/*
+ F:    tools/lib/perf/
  F:    tools/perf/
  
  PERFORMANCE EVENTS SUBSYSTEM ARM64 PMU EVENTS
@@@ -13597,22 -13737,19 +13737,19 @@@ F:        drivers/block/pktcdvd.
  F:    include/linux/pktcdvd.h
  F:    include/uapi/linux/pktcdvd.h
  
- PKUNITY SOC DRIVERS
- M:    Guan Xuetao <[email protected]>
- S:    Maintained
- W:    http://mprc.pku.edu.cn/~guanxuetao/linux
- T:    git git://github.com/gxt/linux.git
- F:    drivers/i2c/busses/i2c-puv3.c
- F:    drivers/input/serio/i8042-unicore32io.h
- F:    drivers/rtc/rtc-puv3.c
- F:    drivers/video/fbdev/fb-puv3.c
- 
  PLANTOWER PMS7003 AIR POLLUTION SENSOR DRIVER
  M:    Tomasz Duszynski <[email protected]>
  S:    Maintained
  F:    Documentation/devicetree/bindings/iio/chemical/plantower,pms7003.yaml
  F:    drivers/iio/chemical/pms7003.c
  
+ PLDMFW LIBRARY
+ M:    Jacob Keller <[email protected]>
+ S:    Maintained
+ F:    Documentation/driver-api/pldmfw/
+ F:    include/linux/pldmfw.h
+ F:    lib/pldmfw/
+ 
  PLX DMA DRIVER
  M:    Logan Gunthorpe <[email protected]>
  S:    Maintained
@@@ -14070,7 -14207,7 +14207,7 @@@ QLOGIC QLA3XXX NETWORK DRIVE
  M:    [email protected]
  L:    [email protected]
  S:    Supported
- F:    Documentation/networking/device_drivers/qlogic/LICENSE.qla3xxx
+ F:    Documentation/networking/device_drivers/ethernet/qlogic/LICENSE.qla3xxx
  F:    drivers/net/ethernet/qlogic/qla3xxx.*
  
  QLOGIC QLA4XXX iSCSI DRIVER
@@@ -14121,7 -14258,7 +14258,7 @@@ M:   Laurentiu Tudor <laurentiu.tudor@nxp
  L:    [email protected]
  S:    Maintained
  F:    Documentation/devicetree/bindings/misc/fsl,qoriq-mc.txt
- F:    Documentation/networking/device_drivers/freescale/dpaa2/overview.rst
+ F:    Documentation/networking/device_drivers/ethernet/freescale/dpaa2/overview.rst
  F:    drivers/bus/fsl-mc/
  
  QT1010 MEDIA DRIVER
@@@ -14243,12 -14380,12 +14380,12 @@@ M:        Subash Abhinov Kasiviswanathan <suba
  M:    Sean Tranchetti <[email protected]>
  L:    [email protected]
  S:    Maintained
- F:    Documentation/networking/device_drivers/qualcomm/rmnet.rst
+ F:    Documentation/networking/device_drivers/cellular/qualcomm/rmnet.rst
  F:    drivers/net/ethernet/qualcomm/rmnet/
  F:    include/linux/if_rmnet.h
  
  QUALCOMM TSENS THERMAL DRIVER
- M:    Amit Kucheria <amit.kucheria@linaro.org>
+ M:    Amit Kucheria <amitk@kernel.org>
  L:    [email protected]
  L:    [email protected]
  S:    Maintained
@@@ -14388,6 -14525,19 +14525,19 @@@ L: [email protected]
  S:    Orphan
  F:    drivers/net/wireless/ray*
  
+ RC-CORE / LIRC FRAMEWORK
+ M:    Sean Young <[email protected]>
+ L:    [email protected]
+ S:    Maintained
+ W:    http://linuxtv.org
+ T:    git git://linuxtv.org/media_tree.git
+ F:    Documentation/driver-api/media/rc-core.rst
+ F:    Documentation/userspace-api/media/rc/
+ F:    drivers/media/rc/
+ F:    include/media/rc-map.h
+ F:    include/media/rc-core.h
+ F:    include/uapi/linux/lirc.h
+ 
  RCMM REMOTE CONTROLS DECODER
  M:    Patrick Lerda <[email protected]>
  S:    Maintained
@@@ -14404,6 -14554,18 +14554,18 @@@ S: Supporte
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git dev
  F:    tools/testing/selftests/rcutorture
  
+ RDACM20 Camera Sensor
+ M:    Jacopo Mondi <[email protected]>
+ M:    Kieran Bingham <[email protected]>
+ M:    Laurent Pinchart <[email protected]>
+ M:    Niklas Söderlund <[email protected]>
+ L:    [email protected]
+ S:    Maintained
+ F:    Documentation/devicetree/bindings/media/i2c/imi,rdacm2x-gmsl.yaml
+ F:    drivers/media/i2c/rdacm20.c
+ F:    drivers/media/i2c/max9271.c
+ F:    drivers/media/i2c/max9271.h
+ 
  RDC R-321X SoC
  M:    Florian Fainelli <[email protected]>
  S:    Maintained
@@@ -14455,7 -14617,7 +14617,7 @@@ T:   git git://git.kernel.org/pub/scm/lin
  F:    Documentation/RCU/
  F:    include/linux/rcu*
  F:    kernel/rcu/
- X:    Documentation/RCU/torture.txt
+ X:    Documentation/RCU/torture.rst
  X:    include/linux/srcu*.h
  X:    kernel/rcu/srcu*.c
  
@@@ -14531,7 -14693,7 +14693,7 @@@ S:   Maintaine
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/andersson/remoteproc.git rproc-next
  F:    Documentation/ABI/testing/sysfs-class-remoteproc
  F:    Documentation/devicetree/bindings/remoteproc/
- F:    Documentation/remoteproc.txt
+ F:    Documentation/staging/remoteproc.rst
  F:    drivers/remoteproc/
  F:    include/linux/remoteproc.h
  F:    include/linux/remoteproc/
@@@ -14543,7 -14705,7 +14705,7 @@@ L:   [email protected]
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/andersson/remoteproc.git rpmsg-next
  F:    Documentation/ABI/testing/sysfs-bus-rpmsg
- F:    Documentation/rpmsg.txt
+ F:    Documentation/staging/rpmsg.rst
  F:    drivers/rpmsg/
  F:    include/linux/rpmsg.h
  F:    include/linux/rpmsg/
@@@ -14735,6 -14897,13 +14897,13 @@@ L: [email protected]
  S:    Odd Fixes
  F:    drivers/tty/serial/rp2.*
  
+ ROHM BD99954 CHARGER IC
+ R:    Matti Vaittinen <[email protected]>
+ L:    [email protected]
+ S:    Supported
+ F:    drivers/power/supply/bd99954-charger.c
+ F:    drivers/power/supply/bd99954-charger.h
+ 
  ROHM BH1750 AMBIENT LIGHT SENSOR DRIVER
  M:    Tomasz Duszynski <[email protected]>
  S:    Maintained
@@@ -14752,6 -14921,31 +14921,31 @@@ F: drivers/mfd/bd9571mwv.
  F:    drivers/regulator/bd9571mwv-regulator.c
  F:    include/linux/mfd/bd9571mwv.h
  
+ ROHM POWER MANAGEMENT IC DEVICE DRIVERS
+ R:    Matti Vaittinen <[email protected]>
+ L:    [email protected]
+ S:    Supported
+ F:    Documentation/devicetree/bindings/mfd/rohm,bd70528-pmic.txt
+ F:    Documentation/devicetree/bindings/regulator/rohm,bd70528-regulator.txt
+ F:    drivers/clk/clk-bd718x7.c
+ F:    drivers/gpio/gpio-bd70528.c
+ F:    drivers/gpio/gpio-bd71828.c
+ F:    drivers/mfd/rohm-bd70528.c
+ F:    drivers/mfd/rohm-bd71828.c
+ F:    drivers/mfd/rohm-bd718x7.c
+ F:    drivers/power/supply/bd70528-charger.c
+ F:    drivers/regulator/bd70528-regulator.c
+ F:    drivers/regulator/bd71828-regulator.c
+ F:    drivers/regulator/bd718x7-regulator.c
+ F:    drivers/regulator/rohm-regulator.c
+ F:    drivers/rtc/rtc-bd70528.c
+ F:    drivers/watchdog/bd70528_wdt.c
+ F:    include/linux/mfd/rohm-bd70528.h
+ F:    include/linux/mfd/rohm-bd71828.h
+ F:    include/linux/mfd/rohm-bd718x7.h
+ F:    include/linux/mfd/rohm-generic.h
+ F:    include/linux/mfd/rohm-shared.h
+ 
  ROSE NETWORK LAYER
  M:    Ralf Baechle <[email protected]>
  L:    [email protected]
@@@ -15315,7 -15509,7 +15509,7 @@@ F:   drivers/mmc/host/sdhci
  F:    include/linux/mmc/sdhci*
  
  SECURE DIGITAL HOST CONTROLLER INTERFACE (SDHCI) MICROCHIP DRIVER
- M:    Ludovic Desroches <ludovic.desroches@microchip.com>
+ M:    Eugen Hristev <eugen.hristev@microchip.com>
  L:    [email protected]
  S:    Supported
  F:    drivers/mmc/host/sdhci-of-at91.c
@@@ -15380,11 -15574,20 +15574,20 @@@ F:        scripts/selinux
  F:    security/selinux/
  
  SENSABLE PHANTOM
- M:    Jiri Slaby <jirislaby@gmail.com>
+ M:    Jiri Slaby <jirislaby@kernel.org>
  S:    Maintained
  F:    drivers/misc/phantom.c
  F:    include/uapi/linux/phantom.h
  
+ SENSIRION SCD30 CARBON DIOXIDE SENSOR DRIVER
+ M:    Tomasz Duszynski <[email protected]>
+ S:    Maintained
+ F:    Documentation/devicetree/bindings/iio/chemical/sensirion,scd30.yaml
+ F:    drivers/iio/chemical/scd30.h
+ F:    drivers/iio/chemical/scd30_core.c
+ F:    drivers/iio/chemical/scd30_i2c.c
+ F:    drivers/iio/chemical/scd30_serial.c
+ 
  SENSIRION SPS30 AIR POLLUTION SENSOR DRIVER
  M:    Tomasz Duszynski <[email protected]>
  S:    Maintained
@@@ -15436,7 -15639,7 +15639,7 @@@ F:   drivers/net/phy/phylink.
  F:    drivers/net/phy/sfp*
  F:    include/linux/phylink.h
  F:    include/linux/sfp.h
- K:    phylink
+ K:    phylink\.h|struct\s+phylink|\.phylink|>phylink_|phylink_(autoneg|clear|connect|create|destroy|disconnect|ethtool|helper|mac|mii|of|set|start|stop|test|validate)
  
  SGI GRU DRIVER
  M:    Dimitri Sivanich <[email protected]>
@@@ -15783,13 -15986,6 +15986,6 @@@ L:  [email protected]
  S:    Maintained
  F:    drivers/net/ethernet/smsc/smsc9420.*
  
- SOC-CAMERA V4L2 SUBSYSTEM
- L:    [email protected]
- S:    Orphan
- T:    git git://linuxtv.org/media_tree.git
- F:    drivers/staging/media/soc_camera/
- F:    include/media/soc_camera.h
- 
  SOCIONEXT (SNI) AVE NETWORK DRIVER
  M:    Kunihiko Hayashi <[email protected]>
  L:    [email protected]
@@@ -16031,8 -16227,9 +16227,9 @@@ F:   sound/soc/sof
  
  SOUNDWIRE SUBSYSTEM
  M:    Vinod Koul <[email protected]>
- M:    Sanyog Kale <sanyog.r.kale@intel.com>
+ M:    Bard Liao <yung-chuan.liao@linux.intel.com>
  R:    Pierre-Louis Bossart <[email protected]>
+ R:    Sanyog Kale <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  S:    Supported
  F:    Documentation/driver-api/soundwire/
@@@ -16083,6 -16280,16 +16280,16 @@@ Q: https://patchwork.kernel.org/project
  B:    https://bugzilla.kernel.org/enter_bug.cgi?component=Sparse&product=Tools
  F:    include/linux/compiler.h
  
+ SPEAKUP CONSOLE SPEECH DRIVER
+ M:    William Hubbs <[email protected]>
+ M:    Chris Brannon <[email protected]>
+ M:    Kirk Reiser <[email protected]>
+ M:    Samuel Thibault <[email protected]>
+ L:    [email protected]
+ S:    Odd Fixes
+ W:    http://www.linux-speakup.org/
+ F:    drivers/accessibility/speakup/
+ 
  SPEAR CLOCK FRAMEWORK SUPPORT
  M:    Viresh Kumar <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
@@@ -16127,7 -16334,7 +16334,7 @@@ SPIDERNET NETWORK DRIVER for CEL
  M:    Ishizaki Kou <[email protected]>
  L:    [email protected]
  S:    Supported
- F:    Documentation/networking/device_drivers/toshiba/spider_net.rst
+ F:    Documentation/networking/device_drivers/ethernet/toshiba/spider_net.rst
  F:    drivers/net/ethernet/toshiba/spider_net*
  
  SPMI SUBSYSTEM
@@@ -16270,28 -16477,11 +16477,11 @@@ L:        [email protected]
  S:    Maintained
  F:    drivers/staging/sm750fb/
  
- STAGING - SPEAKUP CONSOLE SPEECH DRIVER
- M:    William Hubbs <[email protected]>
- M:    Chris Brannon <[email protected]>
- M:    Kirk Reiser <[email protected]>
- M:    Samuel Thibault <[email protected]>
- L:    [email protected]
- S:    Odd Fixes
- W:    http://www.linux-speakup.org/
- F:    drivers/staging/speakup/
- 
  STAGING - VIA VT665X DRIVERS
  M:    Forest Bond <[email protected]>
  S:    Odd Fixes
  F:    drivers/staging/vt665?/
  
- STAGING - WILC1000 WIFI DRIVER
- M:    Adham Abozaeid <[email protected]>
- M:    Ajay Singh <[email protected]>
- L:    [email protected]
- S:    Supported
- F:    drivers/staging/wilc1000/
- 
  STAGING SUBSYSTEM
  M:    Greg Kroah-Hartman <[email protected]>
  L:    [email protected]
@@@ -16354,7 -16544,7 +16544,7 @@@ M:   Jose Abreu <[email protected]
  L:    [email protected]
  S:    Supported
  W:    http://www.stlinux.com
- F:    Documentation/networking/device_drivers/stmicro/
+ F:    Documentation/networking/device_drivers/ethernet/stmicro/
  F:    drivers/net/ethernet/stmicro/stmmac/
  
  SUN3/3X
@@@ -16795,7 -16985,7 +16985,7 @@@ TEE SUBSYSTE
  M:    Jens Wiklander <[email protected]>
  L:    [email protected]
  S:    Maintained
- F:    Documentation/tee.txt
+ F:    Documentation/staging/tee.rst
  F:    drivers/tee/
  F:    include/linux/tee_drv.h
  F:    include/uapi/linux/tee.h
@@@ -16829,8 -17019,10 +17019,10 @@@ F: drivers/i2c/busses/i2c-tegra.
  
  TEGRA IOMMU DRIVERS
  M:    Thierry Reding <[email protected]>
+ R:    Krishna Reddy <[email protected]>
  L:    [email protected]
  S:    Supported
+ F:    drivers/iommu/arm/arm-smmu/arm-smmu-nvidia.c
  F:    drivers/iommu/tegra*
  
  TEGRA KBC DRIVER
@@@ -16921,6 -17113,7 +17113,7 @@@ M:   Tero Kristo <[email protected]
  M:    Santosh Shilimkar <[email protected]>
  L:    [email protected]
  S:    Maintained
+ F:    Documentation/devicetree/bindings/arm/keystone/ti,k3-sci-common.yaml
  F:    Documentation/devicetree/bindings/arm/keystone/ti,sci.txt
  F:    Documentation/devicetree/bindings/clock/ti,sci-clk.txt
  F:    Documentation/devicetree/bindings/interrupt-controller/ti,sci-inta.txt
@@@ -16949,7 -17142,7 +17142,7 @@@ F:   drivers/media/radio/radio-raremono.
  THERMAL
  M:    Zhang Rui <[email protected]>
  M:    Daniel Lezcano <[email protected]>
- R:    Amit Kucheria <amit[email protected]>
+ R:    Amit Kucheria <amit[email protected]>
  L:    [email protected]
  S:    Supported
  Q:    https://patchwork.kernel.org/project/linux-pm/list/
@@@ -16982,6 -17175,14 +17175,14 @@@ F: drivers/thermal/cpufreq_cooling.
  F:    drivers/thermal/cpuidle_cooling.c
  F:    include/linux/cpu_cooling.h
  
+ THERMAL/POWER_ALLOCATOR
+ M:    Lukasz Luba <[email protected]>
+ L:    [email protected]
+ S:    Maintained
+ F:    Documentation/driver-api/thermal/power_allocator.rst
+ F:    drivers/thermal/gov_power_allocator.c
+ F:    include/trace/events/thermal_power_allocator.h
+ 
  THINKPAD ACPI EXTRAS DRIVER
  M:    Henrique de Moraes Holschuh <[email protected]>
  L:    [email protected]
@@@ -17242,7 -17443,7 +17443,7 @@@ M:   Samuel Chessman <[email protected]
  L:    [email protected] (subscribers-only)
  S:    Maintained
  W:    http://sourceforge.net/projects/tlan/
- F:    Documentation/networking/device_drivers/ti/tlan.rst
+ F:    Documentation/networking/device_drivers/ethernet/ti/tlan.rst
  F:    drivers/net/ethernet/ti/tlan.*
  
  TM6000 VIDEO4LINUX DRIVER
@@@ -17307,7 -17508,7 +17508,7 @@@ M:   Josh Triplett <[email protected]
  L:    [email protected]
  S:    Supported
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git dev
- F:    Documentation/RCU/torture.txt
+ F:    Documentation/RCU/torture.rst
  F:    kernel/locking/locktorture.c
  F:    kernel/rcu/rcuperf.c
  F:    kernel/rcu/rcutorture.c
@@@ -17399,7 -17600,7 +17600,7 @@@ K:   ^Subject:.*(?i)trivia
  
  TTY LAYER
  M:    Greg Kroah-Hartman <[email protected]>
- M:    Jiri Slaby <j[email protected]>
+ M:    Jiri Slaby <j[email protected]>
  S:    Supported
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git
  F:    Documentation/driver-api/serial/
@@@ -17551,13 -17752,6 +17752,6 @@@ L:  [email protected]
  S:    Supported
  F:    fs/unicode/
  
- UNICORE32 ARCHITECTURE
- M:    Guan Xuetao <[email protected]>
- S:    Maintained
- W:    http://mprc.pku.edu.cn/~guanxuetao/linux
- T:    git git://github.com/gxt/linux.git
- F:    arch/unicore32/
- 
  UNIFDEF
  M:    Tony Finch <[email protected]>
  S:    Maintained
@@@ -18887,6 -19081,15 +19081,15 @@@ F: Documentation/devicetree/bindings/dm
  F:    drivers/dma/xilinx/xilinx_dpdma.c
  F:    include/dt-bindings/dma/xlnx-zynqmp-dpdma.h
  
+ XILINX ZYNQMP PSGTR PHY DRIVER
+ M:    Anurag Kumar Vulisha <[email protected]>
+ M:    Laurent Pinchart <[email protected]>
+ L:    [email protected]
+ S:    Supported
+ T:    git https://github.com/Xilinx/linux-xlnx.git
+ F:    Documentation/devicetree/bindings/phy/xlnx,zynqmp-psgtr.yaml
+ F:    drivers/phy/xilinx/phy-zynqmp.c
+ 
  XILLYBUS DRIVER
  M:    Eli Billauer <[email protected]>
  L:    [email protected]
@@@ -18943,7 -19146,7 +19146,7 @@@ L:   [email protected]
  S:    Maintained
  W:    http://yaina.de/jreuter/
  W:    http://www.qsl.net/dl1bke/
- F:    Documentation/networking/z8530drv.rst
+ F:    Documentation/networking/device_drivers/hamradio/z8530drv.rst
  F:    drivers/net/hamradio/*scc.c
  F:    drivers/net/hamradio/z8530.h
  

diff --combined drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c
index a7a30e39aa1b4955485269d7a20002b824d730a8,a58af513c952628e545f306790e5aa7f936f5537..aa2b328c62024fca9372c36b075631e3a6d199b6
--- 1/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c
--- 2/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c
@@@ -258,11 -258,9 +258,9 @@@ static int amdgpu_amdkfd_remove_evictio
        new->shared_count = k;
  
        /* Install the new fence list, seqcount provides the barriers */
-       preempt_disable();
        write_seqcount_begin(&resv->seq);
        RCU_INIT_POINTER(resv->fence, new);
        write_seqcount_end(&resv->seq);
-       preempt_enable();
  
        /* Drop the references to the removed fences or move them to ef_list */
        for (i = j, k = 0; i < old->shared_count; ++i) {
@@@ -564,7 -562,7 +562,7 @@@ static int init_user_pages(struct kgd_m
  
        mutex_lock(&process_info->lock);
  
 -      ret = amdgpu_ttm_tt_set_userptr(bo->tbo.ttm, user_addr, 0);
 +      ret = amdgpu_ttm_tt_set_userptr(&bo->tbo, user_addr, 0);
        if (ret) {
                pr_err("%s: Failed to set userptr: %d\n", __func__, ret);
                goto out;

diff --combined drivers/gpu/drm/exynos/exynos_drm_dsi.c
index db0eab53dcfeaa16885b8435d2068f2a11aaabd6,7a6f6df5e9540abbde6cc7d4ace49733fccdf965..843dfcefc46a090e9ae016ad00cac968f5454c41
--- 1/drivers/gpu/drm/exynos/exynos_drm_dsi.c
--- 2/drivers/gpu/drm/exynos/exynos_drm_dsi.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_dsi.c
@@@ -547,9 -547,9 +547,9 @@@ static unsigned long exynos_dsi_pll_fin
        unsigned long best_freq = 0;
        u32 min_delta = 0xffffffff;
        u8 p_min, p_max;
-       u8 _p, uninitialized_var(best_p);
-       u16 _m, uninitialized_var(best_m);
-       u8 _s, uninitialized_var(best_s);
+       u8 _p, best_p;
+       u16 _m, best_m;
+       u8 _s, best_s;
  
        p_min = DIV_ROUND_UP(fin, (12 * MHZ));
        p_max = fin / (6 * MHZ);
@@@ -1551,10 -1551,12 +1551,10 @@@ static int exynos_dsi_host_attach(struc
                }
  
                dsi->panel = of_drm_find_panel(device->dev.of_node);
 -              if (IS_ERR(dsi->panel)) {
 +              if (IS_ERR(dsi->panel))
                        dsi->panel = NULL;
 -              } else {
 -                      drm_panel_attach(dsi->panel, &dsi->connector);
 +              else
                        dsi->connector.status = connector_status_connected;
 -              }
        }
  
        /*
@@@ -1594,6 -1596,7 +1594,6 @@@ static int exynos_dsi_host_detach(struc
        if (dsi->panel) {
                mutex_lock(&drm->mode_config.mutex);
                exynos_dsi_disable(&dsi->encoder);
 -              drm_panel_detach(dsi->panel);
                dsi->panel = NULL;
                dsi->connector.status = connector_status_disconnected;
                mutex_unlock(&drm->mode_config.mutex);

diff --combined drivers/gpu/drm/virtio/virtgpu_kms.c
index bf060c69850fdc90a98d7f10b4fd6d4855900afa,4d944a0dff3e981bbeed4c30ab8d1d0c29aaff82..75d0dc2f6d2852ffe7a7e17b8b81fbd00b601bcb
--- 1/drivers/gpu/drm/virtio/virtgpu_kms.c
--- 2/drivers/gpu/drm/virtio/virtgpu_kms.c
+++ b/drivers/gpu/drm/virtio/virtgpu_kms.c
@@@ -39,8 -39,8 +39,8 @@@ static void virtio_gpu_config_changed_w
        u32 events_read, events_clear = 0;
  
        /* read the config space */
-       virtio_cread(vgdev->vdev, struct virtio_gpu_config,
-                    events_read, &events_read);
+       virtio_cread_le(vgdev->vdev, struct virtio_gpu_config,
+                       events_read, &events_read);
        if (events_read & VIRTIO_GPU_EVENT_DISPLAY) {
                if (vgdev->has_edid)
                        virtio_gpu_cmd_get_edids(vgdev);
@@@ -49,8 -49,8 +49,8 @@@
                drm_helper_hpd_irq_event(vgdev->ddev);
                events_clear |= VIRTIO_GPU_EVENT_DISPLAY;
        }
-       virtio_cwrite(vgdev->vdev, struct virtio_gpu_config,
-                     events_clear, &events_clear);
+       virtio_cwrite_le(vgdev->vdev, struct virtio_gpu_config,
+                        events_clear, &events_clear);
  }
  
  static void virtio_gpu_init_vq(struct virtio_gpu_queue *vgvq,
@@@ -118,7 -118,6 +118,7 @@@ int virtio_gpu_init(struct drm_device *
        vgdev->dev = dev->dev;
  
        spin_lock_init(&vgdev->display_info_lock);
 +      spin_lock_init(&vgdev->resource_export_lock);
        ida_init(&vgdev->ctx_id_ida);
        ida_init(&vgdev->resource_ida);
        init_waitqueue_head(&vgdev->resp_wq);
@@@ -147,9 -146,6 +147,9 @@@
        if (virtio_has_feature(vgdev->vdev, VIRTIO_RING_F_INDIRECT_DESC)) {
                vgdev->has_indirect = true;
        }
 +      if (virtio_has_feature(vgdev->vdev, VIRTIO_GPU_F_RESOURCE_UUID)) {
 +              vgdev->has_resource_assign_uuid = true;
 +      }
  
        DRM_INFO("features: %cvirgl %cedid\n",
                 vgdev->has_virgl_3d ? '+' : '-',
@@@ -169,8 -165,8 +169,8 @@@
        }
  
        /* get display info */
-       virtio_cread(vgdev->vdev, struct virtio_gpu_config,
-                    num_scanouts, &num_scanouts);
+       virtio_cread_le(vgdev->vdev, struct virtio_gpu_config,
+                       num_scanouts, &num_scanouts);
        vgdev->num_scanouts = min_t(uint32_t, num_scanouts,
                                    VIRTIO_GPU_MAX_SCANOUTS);
        if (!vgdev->num_scanouts) {
@@@ -180,8 -176,8 +180,8 @@@
        }
        DRM_INFO("number of scanouts: %d\n", num_scanouts);
  
-       virtio_cread(vgdev->vdev, struct virtio_gpu_config,
-                    num_capsets, &num_capsets);
+       virtio_cread_le(vgdev->vdev, struct virtio_gpu_config,
+                       num_capsets, &num_capsets);
        DRM_INFO("number of cap sets: %d\n", num_capsets);
  
        virtio_gpu_modeset_init(vgdev);

diff --combined drivers/gpu/drm/virtio/virtgpu_object.c
index 1359eb8f1a02211160b7e5d8b08757665813e5f4,2cdd3cd9ce75fc44599310212aeec301fd68ee5f..729f98ad7c02039ced5fa52666aee81919fa45ff
--- 1/drivers/gpu/drm/virtio/virtgpu_object.c
--- 2/drivers/gpu/drm/virtio/virtgpu_object.c
+++ b/drivers/gpu/drm/virtio/virtgpu_object.c
@@@ -141,7 -141,7 +141,7 @@@ static int virtio_gpu_object_shmem_init
                                        struct virtio_gpu_mem_entry **ents,
                                        unsigned int *nents)
  {
-       bool use_dma_api = !virtio_has_iommu_quirk(vgdev->vdev);
+       bool use_dma_api = !virtio_has_dma_quirk(vgdev->vdev);
        struct virtio_gpu_object_shmem *shmem = to_virtio_gpu_shmem(bo);
        struct scatterlist *sg;
        int si, ret;
@@@ -150,13 -150,7 +150,13 @@@
        if (ret < 0)
                return -EINVAL;
  
 -      shmem->pages = drm_gem_shmem_get_pages_sgt(&bo->base.base);
 +      /*
 +       * virtio_gpu uses drm_gem_shmem_get_sg_table instead of
 +       * drm_gem_shmem_get_pages_sgt because virtio has it's own set of
 +       * dma-ops. This is discouraged for other drivers, but should be fine
 +       * since virtio_gpu doesn't support dma-buf import from other devices.
 +       */
 +      shmem->pages = drm_gem_shmem_get_sg_table(&bo->base.base);
        if (!shmem->pages) {
                drm_gem_shmem_unpin(&bo->base.base);
                return -EINVAL;

diff --combined drivers/gpu/drm/virtio/virtgpu_vq.c
index 823223b0bb75ad5a0631a84c874479ba220a2ada,53af60d484a4489bc8588be680513e8721cc1601..c93c2db35aaf318d601ee90f23ee42fbf82b647a
--- 1/drivers/gpu/drm/virtio/virtgpu_vq.c
--- 2/drivers/gpu/drm/virtio/virtgpu_vq.c
+++ b/drivers/gpu/drm/virtio/virtgpu_vq.c
@@@ -599,7 -599,7 +599,7 @@@ void virtio_gpu_cmd_transfer_to_host_2d
        struct virtio_gpu_object *bo = gem_to_virtio_gpu_obj(objs->objs[0]);
        struct virtio_gpu_transfer_to_host_2d *cmd_p;
        struct virtio_gpu_vbuffer *vbuf;
-       bool use_dma_api = !virtio_has_iommu_quirk(vgdev->vdev);
+       bool use_dma_api = !virtio_has_dma_quirk(vgdev->vdev);
        struct virtio_gpu_object_shmem *shmem = to_virtio_gpu_shmem(bo);
  
        if (use_dma_api)
@@@ -1015,7 -1015,7 +1015,7 @@@ void virtio_gpu_cmd_transfer_to_host_3d
        struct virtio_gpu_object *bo = gem_to_virtio_gpu_obj(objs->objs[0]);
        struct virtio_gpu_transfer_host_3d *cmd_p;
        struct virtio_gpu_vbuffer *vbuf;
-       bool use_dma_api = !virtio_has_iommu_quirk(vgdev->vdev);
+       bool use_dma_api = !virtio_has_dma_quirk(vgdev->vdev);
        struct virtio_gpu_object_shmem *shmem = to_virtio_gpu_shmem(bo);
  
        if (use_dma_api)
@@@ -1107,58 -1107,3 +1107,58 @@@ void virtio_gpu_cursor_ping(struct virt
        memcpy(cur_p, &output->cursor, sizeof(output->cursor));
        virtio_gpu_queue_cursor(vgdev, vbuf);
  }
 +
 +static void virtio_gpu_cmd_resource_uuid_cb(struct virtio_gpu_device *vgdev,
 +                                          struct virtio_gpu_vbuffer *vbuf)
 +{
 +      struct virtio_gpu_object *obj =
 +              gem_to_virtio_gpu_obj(vbuf->objs->objs[0]);
 +      struct virtio_gpu_resp_resource_uuid *resp =
 +              (struct virtio_gpu_resp_resource_uuid *)vbuf->resp_buf;
 +      uint32_t resp_type = le32_to_cpu(resp->hdr.type);
 +
 +      spin_lock(&vgdev->resource_export_lock);
 +      WARN_ON(obj->uuid_state != UUID_INITIALIZING);
 +
 +      if (resp_type == VIRTIO_GPU_RESP_OK_RESOURCE_UUID &&
 +          obj->uuid_state == UUID_INITIALIZING) {
 +              memcpy(&obj->uuid.b, resp->uuid, sizeof(obj->uuid.b));
 +              obj->uuid_state = UUID_INITIALIZED;
 +      } else {
 +              obj->uuid_state = UUID_INITIALIZATION_FAILED;
 +      }
 +      spin_unlock(&vgdev->resource_export_lock);
 +
 +      wake_up_all(&vgdev->resp_wq);
 +}
 +
 +int
 +virtio_gpu_cmd_resource_assign_uuid(struct virtio_gpu_device *vgdev,
 +                                  struct virtio_gpu_object_array *objs)
 +{
 +      struct virtio_gpu_object *bo = gem_to_virtio_gpu_obj(objs->objs[0]);
 +      struct virtio_gpu_resource_assign_uuid *cmd_p;
 +      struct virtio_gpu_vbuffer *vbuf;
 +      struct virtio_gpu_resp_resource_uuid *resp_buf;
 +
 +      resp_buf = kzalloc(sizeof(*resp_buf), GFP_KERNEL);
 +      if (!resp_buf) {
 +              spin_lock(&vgdev->resource_export_lock);
 +              bo->uuid_state = UUID_INITIALIZATION_FAILED;
 +              spin_unlock(&vgdev->resource_export_lock);
 +              virtio_gpu_array_put_free(objs);
 +              return -ENOMEM;
 +      }
 +
 +      cmd_p = virtio_gpu_alloc_cmd_resp
 +              (vgdev, virtio_gpu_cmd_resource_uuid_cb, &vbuf, sizeof(*cmd_p),
 +               sizeof(struct virtio_gpu_resp_resource_uuid), resp_buf);
 +      memset(cmd_p, 0, sizeof(*cmd_p));
 +
 +      cmd_p->hdr.type = cpu_to_le32(VIRTIO_GPU_CMD_RESOURCE_ASSIGN_UUID);
 +      cmd_p->resource_id = cpu_to_le32(bo->hw_res_handle);
 +
 +      vbuf->objs = objs;
 +      virtio_gpu_queue_ctrl_buffer(vgdev, vbuf);
 +      return 0;
 +}

diff --combined include/linux/moduleparam.h
index cff7261e98bbe6558da738702fcdb0422c3849ce,1ad5aa3b86d9fcee1090e88387131d444b42c4f0..47879fc7f75e1f2284e3ef760f3577b1af59378e
--- 1/include/linux/moduleparam.h
--- 2/include/linux/moduleparam.h
+++ b/include/linux/moduleparam.h
@@@ -108,7 -108,7 +108,7 @@@ struct kparam_arra
   * ".") the kernel commandline parameter.  Note that - is changed to _, so
   * the user can use "foo-bar=1" even for variable "foo_bar".
   *
-  * @perm is 0 if the the variable is not to appear in sysfs, or 0444
+  * @perm is 0 if the variable is not to appear in sysfs, or 0444
   * for world-readable, 0644 for root-writable, etc.  Note that if it
   * is writable, you may need to use kernel_param_lock() around
   * accesses (esp. charp, which can be kfreed when it changes).
@@@ -118,7 -118,7 +118,7 @@@
   * you can create your own by defining those variables.
   *
   * Standard types are:
 - *    byte, short, ushort, int, uint, long, ulong
 + *    byte, hexint, short, ushort, int, uint, long, ulong
   *    charp: a character pointer
   *    bool: a bool, values 0/1, y/n, Y/N.
   *    invbool: the above, only sense-reversed (N = true).
@@@ -448,11 -448,6 +448,11 @@@ extern int param_set_ullong(const char 
  extern int param_get_ullong(char *buffer, const struct kernel_param *kp);
  #define param_check_ullong(name, p) __param_check(name, p, unsigned long long)
  
 +extern const struct kernel_param_ops param_ops_hexint;
 +extern int param_set_hexint(const char *val, const struct kernel_param *kp);
 +extern int param_get_hexint(char *buffer, const struct kernel_param *kp);
 +#define param_check_hexint(name, p) param_check_uint(name, p)
 +
  extern const struct kernel_param_ops param_ops_charp;
  extern int param_set_charp(const char *val, const struct kernel_param *kp);
  extern int param_get_charp(char *buffer, const struct kernel_param *kp);

diff --combined include/uapi/linux/virtio_gpu.h
index 9721d58b4d5812158ebcf163aed7001e5d4cb0bd,ccbd174ef32190bb715217e41d67e876dcfa17d4..747a5c5cc4e60665047891d940f43be8d7292be0
--- 1/include/uapi/linux/virtio_gpu.h
--- 2/include/uapi/linux/virtio_gpu.h
+++ b/include/uapi/linux/virtio_gpu.h
@@@ -50,10 -50,6 +50,10 @@@
   * VIRTIO_GPU_CMD_GET_EDID
   */
  #define VIRTIO_GPU_F_EDID                1
 +/*
 + * VIRTIO_GPU_CMD_RESOURCE_ASSIGN_UUID
 + */
 +#define VIRTIO_GPU_F_RESOURCE_UUID       2
  
  enum virtio_gpu_ctrl_type {
        VIRTIO_GPU_UNDEFINED = 0,
@@@ -70,7 -66,6 +70,7 @@@
        VIRTIO_GPU_CMD_GET_CAPSET_INFO,
        VIRTIO_GPU_CMD_GET_CAPSET,
        VIRTIO_GPU_CMD_GET_EDID,
 +      VIRTIO_GPU_CMD_RESOURCE_ASSIGN_UUID,
  
        /* 3d commands */
        VIRTIO_GPU_CMD_CTX_CREATE = 0x0200,
@@@ -92,7 -87,6 +92,7 @@@
        VIRTIO_GPU_RESP_OK_CAPSET_INFO,
        VIRTIO_GPU_RESP_OK_CAPSET,
        VIRTIO_GPU_RESP_OK_EDID,
 +      VIRTIO_GPU_RESP_OK_RESOURCE_UUID,
  
        /* error responses */
        VIRTIO_GPU_RESP_ERR_UNSPEC = 0x1200,
@@@ -326,10 -320,10 +326,10 @@@ struct virtio_gpu_resp_edid 
  #define VIRTIO_GPU_EVENT_DISPLAY (1 << 0)
  
  struct virtio_gpu_config {
-       __u32 events_read;
-       __u32 events_clear;
-       __u32 num_scanouts;
-       __u32 num_capsets;
+       __le32 events_read;
+       __le32 events_clear;
+       __le32 num_scanouts;
+       __le32 num_capsets;
  };
  
  /* simple formats for fbcon/X use */
@@@ -346,17 -340,4 +346,17 @@@ enum virtio_gpu_formats 
        VIRTIO_GPU_FORMAT_R8G8B8X8_UNORM  = 134,
  };
  
 +/* VIRTIO_GPU_CMD_RESOURCE_ASSIGN_UUID */
 +struct virtio_gpu_resource_assign_uuid {
 +      struct virtio_gpu_ctrl_hdr hdr;
 +      __le32 resource_id;
 +      __le32 padding;
 +};
 +
 +/* VIRTIO_GPU_RESP_OK_RESOURCE_UUID */
 +struct virtio_gpu_resp_resource_uuid {
 +      struct virtio_gpu_ctrl_hdr hdr;
 +      __u8 uuid[16];
 +};
 +
  #endif