Merge drm/drm-next into drm-intel-gt-next
authorTvrtko Ursulin <tvrtko.ursulin@intel.com>
Mon, 22 Nov 2021 12:18:15 +0000 (12:18 +0000)
committerTvrtko Ursulin <tvrtko.ursulin@intel.com>
Mon, 22 Nov 2021 12:18:15 +0000 (12:18 +0000)
Thomas needs the dma_resv_for_each_fence API for i915/ttm async migration
work.

Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
1  2 
MAINTAINERS
drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c
drivers/gpu/drm/i915/gt/intel_context.c
drivers/gpu/drm/i915/i915_reg.h
drivers/gpu/drm/i915/i915_request.c
drivers/gpu/drm/i915/i915_vma.c
drivers/gpu/drm/i915/intel_pm.c

diff --combined MAINTAINERS
@@@ -334,7 -334,7 +334,7 @@@ F: drivers/platform/x86/acer-wmi.
  
  ACPI
  M:    "Rafael J. Wysocki" <rafael@kernel.org>
M:    Len Brown <lenb@kernel.org>
R:    Len Brown <lenb@kernel.org>
  L:    linux-acpi@vger.kernel.org
  S:    Supported
  W:    https://01.org/linux-acpi
@@@ -355,7 -355,7 +355,7 @@@ F: tools/power/acpi
  
  ACPI APEI
  M:    "Rafael J. Wysocki" <rafael@kernel.org>
M:    Len Brown <lenb@kernel.org>
R:    Len Brown <lenb@kernel.org>
  R:    James Morse <james.morse@arm.com>
  R:    Tony Luck <tony.luck@intel.com>
  R:    Borislav Petkov <bp@alien8.de>
@@@ -378,14 -378,6 +378,6 @@@ F:        drivers/acpi/acpica
  F:    include/acpi/
  F:    tools/power/acpi/
  
- ACPI FAN DRIVER
- M:    Zhang Rui <rui.zhang@intel.com>
- L:    linux-acpi@vger.kernel.org
- S:    Supported
- W:    https://01.org/linux-acpi
- B:    https://bugzilla.kernel.org
- F:    drivers/acpi/fan.c
  ACPI FOR ARM64 (ACPI/arm64)
  M:    Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
  M:    Hanjun Guo <guohanjun@huawei.com>
@@@ -401,6 -393,12 +393,12 @@@ L:       platform-driver-x86@vger.kernel.or
  S:    Maintained
  F:    drivers/platform/x86/i2c-multi-instantiate.c
  
+ ACPI PCC(Platform Communication Channel) MAILBOX DRIVER
+ M:    Sudeep Holla <sudeep.holla@arm.com>
+ L:    linux-acpi@vger.kernel.org
+ S:    Supported
+ F:    drivers/mailbox/pcc.c
  ACPI PMIC DRIVERS
  M:    "Rafael J. Wysocki" <rafael@kernel.org>
  M:    Len Brown <lenb@kernel.org>
@@@ -414,21 -412,14 +412,14 @@@ T:      git git://git.kernel.org/pub/scm/lin
  F:    drivers/acpi/pmic/
  
  ACPI THERMAL DRIVER
- M:    Zhang Rui <rui.zhang@intel.com>
+ M:    Rafael J. Wysocki <rafael@kernel.org>
+ R:    Zhang Rui <rui.zhang@intel.com>
  L:    linux-acpi@vger.kernel.org
  S:    Supported
  W:    https://01.org/linux-acpi
  B:    https://bugzilla.kernel.org
  F:    drivers/acpi/*thermal*
  
- ACPI VIDEO DRIVER
- M:    Zhang Rui <rui.zhang@intel.com>
- L:    linux-acpi@vger.kernel.org
- S:    Supported
- W:    https://01.org/linux-acpi
- B:    https://bugzilla.kernel.org
- F:    drivers/acpi/acpi_video.c
  ACPI VIOT DRIVER
  M:    Jean-Philippe Brucker <jean-philippe@linaro.org>
  L:    linux-acpi@vger.kernel.org
@@@ -590,6 -581,12 +581,12 @@@ L:       platform-driver-x86@vger.kernel.or
  S:    Maintained
  F:    drivers/platform/x86/adv_swbutton.c
  
+ ADXL313 THREE-AXIS DIGITAL ACCELEROMETER DRIVER
+ M:    Lucas Stankus <lucas.p.stankus@gmail.com>
+ S:    Supported
+ F:    Documentation/devicetree/bindings/iio/accel/adi,adxl313.yaml
+ F:    drivers/iio/accel/adxl313*
  ADXL34X THREE-AXIS DIGITAL ACCELEROMETER DRIVER (ADXL345/ADXL346)
  M:    Michael Hennerich <michael.hennerich@analog.com>
  S:    Supported
@@@ -598,6 -595,16 +595,16 @@@ W:       http://ez.analog.com/community/linux
  F:    Documentation/devicetree/bindings/iio/accel/adi,adxl345.yaml
  F:    drivers/input/misc/adxl34x.c
  
+ ADXL355 THREE-AXIS DIGITAL ACCELEROMETER DRIVER
+ M:    Puranjay Mohan <puranjay12@gmail.com>
+ L:    linux-iio@vger.kernel.org
+ S:    Supported
+ F:    Documentation/devicetree/bindings/iio/accel/adi,adxl355.yaml
+ F:    drivers/iio/accel/adxl355.h
+ F:    drivers/iio/accel/adxl355_core.c
+ F:    drivers/iio/accel/adxl355_i2c.c
+ F:    drivers/iio/accel/adxl355_spi.c
  ADXL372 THREE-AXIS DIGITAL ACCELEROMETER DRIVER
  M:    Michael Hennerich <michael.hennerich@analog.com>
  S:    Supported
@@@ -760,7 -767,7 +767,7 @@@ F: drivers/crypto/allwinner
  ALLWINNER HARDWARE SPINLOCK SUPPORT
  M:    Wilken Gottwalt <wilken.gottwalt@posteo.net>
  S:    Maintained
- F:    Documentation/devicetree/bindings/hwlock/allwinner,sun6i-hwspinlock.yaml
+ F:    Documentation/devicetree/bindings/hwlock/allwinner,sun6i-a31-hwspinlock.yaml
  F:    drivers/hwspinlock/sun6i_hwspinlock.c
  
  ALLWINNER THERMAL DRIVER
@@@ -797,7 -804,7 +804,7 @@@ F: Documentation/devicetree/bindings/i2
  F:    drivers/i2c/busses/i2c-altera.c
  
  ALTERA MAILBOX DRIVER
- M:    Joyce Ooi <joyce.ooi@intel.com>
+ M:    Mun Yew Tham <mun.yew.tham@intel.com>
  S:    Maintained
  F:    drivers/mailbox/mailbox-altera.c
  
@@@ -810,7 -817,7 +817,7 @@@ F: Documentation/devicetree/bindings/dm
  F:    drivers/dma/altera-msgdma.c
  
  ALTERA PIO DRIVER
- M:    Joyce Ooi <joyce.ooi@intel.com>
+ M:    Mun Yew Tham <mun.yew.tham@intel.com>
  L:    linux-gpio@vger.kernel.org
  S:    Maintained
  F:    drivers/gpio/gpio-altera.c
@@@ -865,9 -872,10 +872,10 @@@ F:       Documentation/devicetree/bindings/th
  F:    drivers/thermal/thermal_mmio.c
  
  AMAZON ETHERNET DRIVERS
- M:    Netanel Belgazal <netanel@amazon.com>
+ M:    Shay Agroskin <shayagr@amazon.com>
  M:    Arthur Kiyanovski <akiyano@amazon.com>
- R:    Guy Tzalik <gtzalik@amazon.com>
+ R:    David Arinzon <darinzon@amazon.com>
+ R:    Noam Dagan <ndagan@amazon.com>
  R:    Saeed Bishara <saeedb@amazon.com>
  L:    netdev@vger.kernel.org
  S:    Supported
@@@ -902,6 -910,7 +910,7 @@@ F: include/uapi/linux/psp-sev.
  AMD DISPLAY CORE
  M:    Harry Wentland <harry.wentland@amd.com>
  M:    Leo Li <sunpeng.li@amd.com>
+ M:    Rodrigo Siqueira <Rodrigo.Siqueira@amd.com>
  L:    amd-gfx@lists.freedesktop.org
  S:    Supported
  T:    git https://gitlab.freedesktop.org/agd5f/linux.git
@@@ -1019,6 -1028,14 +1028,14 @@@ S:    Maintaine
  F:    Documentation/devicetree/bindings/iio/light/ams,as73211.yaml
  F:    drivers/iio/light/as73211.c
  
+ AMT (Automatic Multicast Tunneling)
+ M:    Taehee Yoo <ap420073@gmail.com>
+ L:    netdev@vger.kernel.org
+ S:    Maintained
+ T:    git git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git
+ T:    git git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git
+ F:    drivers/net/amt.c
  ANALOG DEVICES INC AD7192 DRIVER
  M:    Alexandru Tachici <alexandru.tachici@analog.com>
  L:    linux-iio@vger.kernel.org
@@@ -1275,11 -1292,19 +1292,19 @@@ F:   drivers/input/mouse/bcm5974.
  
  APPLE DART IOMMU DRIVER
  M:    Sven Peter <sven@svenpeter.dev>
+ R:    Alyssa Rosenzweig <alyssa@rosenzweig.io>
  L:    iommu@lists.linux-foundation.org
  S:    Maintained
  F:    Documentation/devicetree/bindings/iommu/apple,dart.yaml
  F:    drivers/iommu/apple-dart.c
  
+ APPLE PCIE CONTROLLER DRIVER
+ M:    Alyssa Rosenzweig <alyssa@rosenzweig.io>
+ M:    Marc Zyngier <maz@kernel.org>
+ L:    linux-pci@vger.kernel.org
+ S:    Maintained
+ F:    drivers/pci/controller/pcie-apple.c
  APPLE SMC DRIVER
  M:    Henrik Rydberg <rydberg@bitmath.org>
  L:    linux-hwmon@vger.kernel.org
@@@ -1411,7 -1436,7 +1436,7 @@@ F:      Documentation/devicetree/bindings/au
  F:    Documentation/devicetree/bindings/clock/arm,syscon-icst.yaml
  F:    Documentation/devicetree/bindings/i2c/i2c-versatile.txt
  F:    Documentation/devicetree/bindings/interrupt-controller/arm,versatile-fpga-irq.txt
- F:    Documentation/devicetree/bindings/mtd/arm-versatile.txt
+ F:    Documentation/devicetree/bindings/mtd/mtd-physmap.yaml
  F:    arch/arm/boot/dts/arm-realview-*
  F:    arch/arm/boot/dts/integrator*
  F:    arch/arm/boot/dts/versatile*
@@@ -1550,7 -1575,7 +1575,7 @@@ ARM PRIMECELL VIC PL190/PL192 DRIVE
  M:    Linus Walleij <linus.walleij@linaro.org>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Maintained
- F:    Documentation/devicetree/bindings/interrupt-controller/arm,vic.txt
+ F:    Documentation/devicetree/bindings/interrupt-controller/arm,vic.yaml
  F:    drivers/irqchip/irq-vic.c
  
  ARM SMC WATCHDOG DRIVER
@@@ -1711,6 -1736,8 +1736,8 @@@ F:      drivers/*/*alpine
  
  ARM/APPLE MACHINE SUPPORT
  M:    Hector Martin <marcan@marcan.st>
+ M:    Sven Peter <sven@svenpeter.dev>
+ R:    Alyssa Rosenzweig <alyssa@rosenzweig.io>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Maintained
  W:    https://asahilinux.org
@@@ -1718,12 -1745,20 +1745,20 @@@ B:   https://github.com/AsahiLinux/linux/
  C:    irc://irc.oftc.net/asahi-dev
  T:    git https://github.com/AsahiLinux/linux.git
  F:    Documentation/devicetree/bindings/arm/apple.yaml
+ F:    Documentation/devicetree/bindings/i2c/apple,i2c.yaml
  F:    Documentation/devicetree/bindings/interrupt-controller/apple,aic.yaml
+ F:    Documentation/devicetree/bindings/mailbox/apple,mailbox.yaml
+ F:    Documentation/devicetree/bindings/pci/apple,pcie.yaml
  F:    Documentation/devicetree/bindings/pinctrl/apple,pinctrl.yaml
  F:    arch/arm64/boot/dts/apple/
+ F:    drivers/i2c/busses/i2c-pasemi-core.c
+ F:    drivers/i2c/busses/i2c-pasemi-platform.c
  F:    drivers/irqchip/irq-apple-aic.c
+ F:    drivers/mailbox/apple-mailbox.c
+ F:    drivers/pinctrl/pinctrl-apple-gpio.c
  F:    include/dt-bindings/interrupt-controller/apple-aic.h
  F:    include/dt-bindings/pinctrl/apple.h
+ F:    include/linux/apple-mailbox.h
  
  ARM/ARTPEC MACHINE SUPPORT
  M:    Jesper Nilsson <jesper.nilsson@axis.com>
@@@ -1745,7 -1780,7 +1780,7 @@@ R:      Joel Stanley <joel@jms.id.au
  L:    linux-i2c@vger.kernel.org
  L:    openbmc@lists.ozlabs.org (moderated for non-subscribers)
  S:    Maintained
- F:    Documentation/devicetree/bindings/i2c/i2c-aspeed.txt
+ F:    Documentation/devicetree/bindings/i2c/aspeed,i2c.yaml
  F:    Documentation/devicetree/bindings/interrupt-controller/aspeed,ast2400-i2c-ic.txt
  F:    drivers/i2c/busses/i2c-aspeed.c
  F:    drivers/irqchip/irq-aspeed-i2c-ic.c
@@@ -1872,10 -1907,10 +1907,10 @@@ M:   Linus Walleij <linus.walleij@linaro.
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Maintained
  T:    git git://github.com/ulli-kroll/linux.git
- F:    Documentation/devicetree/bindings/arm/gemini.txt
+ F:    Documentation/devicetree/bindings/arm/gemini.yaml
  F:    Documentation/devicetree/bindings/net/cortina,gemini-ethernet.txt
  F:    Documentation/devicetree/bindings/pinctrl/cortina,gemini-pinctrl.txt
- F:    Documentation/devicetree/bindings/rtc/faraday,ftrtc010.txt
+ F:    Documentation/devicetree/bindings/rtc/faraday,ftrtc010.yaml
  F:    arch/arm/boot/dts/gemini*
  F:    arch/arm/mach-gemini/
  F:    drivers/crypto/gemini/
@@@ -2236,6 -2271,7 +2271,7 @@@ F:      arch/arm/mach-pxa/mioa701.
  
  ARM/MStar/Sigmastar Armv7 SoC support
  M:    Daniel Palmer <daniel@thingy.jp>
+ M:    Romain Perier <romain.perier@gmail.com>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Maintained
  W:    http://linux-chenxing.org/
@@@ -2247,6 -2283,7 +2283,7 @@@ F:      arch/arm/boot/dts/mstar-
  F:    arch/arm/mach-mstar/
  F:    drivers/clk/mstar/
  F:    drivers/gpio/gpio-msc313.c
+ F:    drivers/rtc/rtc-msc313.c
  F:    drivers/watchdog/msc313e_wdt.c
  F:    include/dt-bindings/clock/mstar-*
  F:    include/dt-bindings/gpio/msc313-gpio.h
@@@ -2307,6 -2344,14 +2344,14 @@@ F:    arch/arm/boot/dts/nuvoton-wpcm450
  F:    arch/arm/mach-npcm/wpcm450.c
  F:    drivers/*/*wpcm*
  
+ ARM/NXP S32G ARCHITECTURE
+ M:    Chester Lin <clin@suse.com>
+ R:    Andreas Färber <afaerber@suse.de>
+ R:    Matthias Brugger <mbrugger@suse.com>
+ L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
+ S:    Maintained
+ F:    arch/arm64/boot/dts/freescale/s32g*.dts*
  ARM/OPENMOKO NEO FREERUNNER (GTA02) MACHINE SUPPORT
  L:    openmoko-kernel@lists.openmoko.org (subscribers-only)
  S:    Orphan
@@@ -2712,6 -2757,7 +2757,7 @@@ F:      drivers/power/reset/keystone-reset.
  
  ARM/TEXAS INSTRUMENTS K3 ARCHITECTURE
  M:    Nishanth Menon <nm@ti.com>
+ M:    Vignesh Raghavendra <vigneshr@ti.com>
  M:    Tero Kristo <kristo@kernel.org>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Supported
@@@ -2739,7 -2785,7 +2785,7 @@@ F:      Documentation/devicetree/bindings/ar
  F:    Documentation/devicetree/bindings/net/toshiba,visconti-dwmac.yaml
  F:    Documentation/devicetree/bindings/gpio/toshiba,gpio-visconti.yaml
  F:    Documentation/devicetree/bindings/pci/toshiba,visconti-pcie.yaml
- F:    Documentation/devicetree/bindings/pinctrl/toshiba,tmpv7700-pinctrl.yaml
+ F:    Documentation/devicetree/bindings/pinctrl/toshiba,visconti-pinctrl.yaml
  F:    Documentation/devicetree/bindings/watchdog/toshiba,visconti-wdt.yaml
  F:    arch/arm64/boot/dts/toshiba/
  F:    drivers/net/ethernet/stmicro/stmmac/dwmac-visconti.c
@@@ -2804,9 -2850,8 +2850,8 @@@ F:      arch/arm/mach-pxa/include/mach/vpac2
  F:    arch/arm/mach-pxa/vpac270.c
  
  ARM/VT8500 ARM ARCHITECTURE
- M:    Tony Prisk <linux@prisktech.co.nz>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
- S:    Maintained
+ S:    Orphan
  F:    Documentation/devicetree/bindings/i2c/i2c-wmt.txt
  F:    arch/arm/mach-vt8500/
  F:    drivers/clocksource/timer-vt8500.c
@@@ -2894,6 -2939,12 +2939,12 @@@ S:    Maintaine
  F:    Documentation/hwmon/asc7621.rst
  F:    drivers/hwmon/asc7621.c
  
+ ASIX AX88796C SPI ETHERNET ADAPTER
+ M:    Łukasz Stelmach <l.stelmach@samsung.com>
+ S:    Maintained
+ F:    Documentation/devicetree/bindings/net/asix,ax88796c.yaml
+ F:    drivers/net/ethernet/asix/ax88796c_*
  ASPEED PINCTRL DRIVERS
  M:    Andrew Jeffery <andrew@aj.id.au>
  L:    linux-aspeed@lists.ozlabs.org (moderated for non-subscribers)
@@@ -2962,7 -3013,7 +3013,7 @@@ F:      crypto/async_tx
  F:    include/linux/async_tx.h
  
  AT24 EEPROM DRIVER
- M:    Bartosz Golaszewski <bgolaszewski@baylibre.com>
+ M:    Bartosz Golaszewski <brgl@bgdev.pl>
  L:    linux-i2c@vger.kernel.org
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git
@@@ -3113,6 -3164,7 +3164,7 @@@ W:      https://github.com/linux-audi
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/audit.git
  F:    include/asm-generic/audit_*.h
  F:    include/linux/audit.h
+ F:    include/linux/audit_arch.h
  F:    include/uapi/linux/audit.h
  F:    kernel/audit*
  F:    lib/*audit.c
  AUXILIARY DISPLAY DRIVERS
  M:    Miguel Ojeda <ojeda@kernel.org>
  S:    Maintained
+ F:    Documentation/devicetree/bindings/auxdisplay/
  F:    drivers/auxdisplay/
  F:    include/linux/cfag12864b.h
  
@@@ -3215,6 -3268,12 +3268,12 @@@ F:    drivers/video/backlight
  F:    include/linux/backlight.h
  F:    include/linux/pwm_backlight.h
  
+ BARCO P50 GPIO DRIVER
+ M:    Santosh Kumar Yadav <santoshkumar.yadav@barco.com>
+ M:    Peter Korsgaard <peter.korsgaard@barco.com>
+ S:    Maintained
+ F:    drivers/platform/x86/barco-p50-gpio.c
  BATMAN ADVANCED
  M:    Marek Lindner <mareklindner@neomailbox.ch>
  M:    Simon Wunderlich <sw@simonwunderlich.de>
@@@ -3385,9 -3444,11 +3444,11 @@@ F:    Documentation/networking/filter.rs
  F:    Documentation/userspace-api/ebpf/
  F:    arch/*/net/*
  F:    include/linux/bpf*
+ F:    include/linux/btf*
  F:    include/linux/filter.h
  F:    include/trace/events/xdp.h
  F:    include/uapi/linux/bpf*
+ F:    include/uapi/linux/btf*
  F:    include/uapi/linux/filter.h
  F:    kernel/bpf/
  F:    kernel/trace/bpf_trace.c
@@@ -3421,6 -3482,7 +3482,7 @@@ S:      Supporte
  F:    arch/arm64/net/
  
  BPF JIT for MIPS (32-BIT AND 64-BIT)
+ M:    Johan Almbladh <johan.almbladh@anyfinetworks.com>
  M:    Paul Burton <paulburton@kernel.org>
  L:    netdev@vger.kernel.org
  L:    bpf@vger.kernel.org
@@@ -3609,6 -3671,8 +3671,8 @@@ F:      arch/arm/mm/cache-b15-rac.
  F:    drivers/bus/brcmstb_gisb.c
  F:    drivers/pci/controller/pcie-brcmstb.c
  N:    brcmstb
+ N:    bcm7038
+ N:    bcm7120
  
  BROADCOM BDC DRIVER
  M:    Al Cooper <alcooperx@gmail.com>
@@@ -3669,7 -3733,7 +3733,7 @@@ F:      drivers/scsi/bnx2i
  BROADCOM BNX2X 10 GIGABIT ETHERNET DRIVER
  M:    Ariel Elior <aelior@marvell.com>
  M:    Sudarsana Kalluru <skalluru@marvell.com>
- M:    GR-everest-linux-l2@marvell.com
+ M:    Manish Chopra <manishc@marvell.com>
  L:    netdev@vger.kernel.org
  S:    Supported
  F:    drivers/net/ethernet/broadcom/bnx2x/
@@@ -3756,7 -3820,7 +3820,7 @@@ L:      bcm-kernel-feedback-list@broadcom.co
  L:    netdev@vger.kernel.org
  S:    Supported
  F:    Documentation/devicetree/bindings/net/brcm,bcmgenet.txt
- F:    Documentation/devicetree/bindings/net/brcm,unimac-mdio.txt
+ F:    Documentation/devicetree/bindings/net/brcm,unimac-mdio.yaml
  F:    drivers/net/ethernet/broadcom/genet/
  F:    drivers/net/ethernet/broadcom/unimac.h
  F:    drivers/net/mdio/mdio-bcm-unimac.c
@@@ -3821,7 -3885,6 +3885,6 @@@ F:      drivers/scsi/mpi3mr
  
  BROADCOM NETXTREME-E ROCE DRIVER
  M:    Selvin Xavier <selvin.xavier@broadcom.com>
- M:    Naresh Kumar PBS <nareshkumar.pbs@broadcom.com>
  L:    linux-rdma@vger.kernel.org
  S:    Supported
  W:    http://www.broadcom.com
@@@ -4396,7 -4459,7 +4459,7 @@@ CHIPONE ICN8318 I2C TOUCHSCREEN DRIVE
  M:    Hans de Goede <hdegoede@redhat.com>
  L:    linux-input@vger.kernel.org
  S:    Maintained
- F:    Documentation/devicetree/bindings/input/touchscreen/chipone_icn8318.txt
+ F:    Documentation/devicetree/bindings/input/touchscreen/chipone,icn8318.yaml
  F:    drivers/input/touchscreen/chipone_icn8318.c
  
  CHIPONE ICN8505 I2C TOUCHSCREEN DRIVER
@@@ -4407,14 -4470,12 +4470,12 @@@ F:   drivers/input/touchscreen/chipone_ic
  
  CHROME HARDWARE PLATFORM SUPPORT
  M:    Benson Leung <bleung@chromium.org>
- M:    Enric Balletbo i Serra <enric.balletbo@collabora.com>
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/chrome-platform/linux.git
  F:    drivers/platform/chrome/
  
  CHROMEOS EC CODEC DRIVER
  M:    Cheng-Yi Chiang <cychiang@chromium.org>
- R:    Enric Balletbo i Serra <enric.balletbo@collabora.com>
  R:    Guenter Roeck <groeck@chromium.org>
  S:    Maintained
  F:    Documentation/devicetree/bindings/sound/google,cros-ec-codec.yaml
@@@ -4422,15 -4483,25 +4483,25 @@@ F:   sound/soc/codecs/cros_ec_codec.
  
  CHROMEOS EC SUBDRIVERS
  M:    Benson Leung <bleung@chromium.org>
- M:    Enric Balletbo i Serra <enric.balletbo@collabora.com>
  R:    Guenter Roeck <groeck@chromium.org>
  S:    Maintained
  F:    drivers/power/supply/cros_usbpd-charger.c
  N:    cros_ec
  N:    cros-ec
  
+ CHROMEOS EC USB TYPE-C DRIVER
+ M:    Prashant Malani <pmalani@chromium.org>
+ S:    Maintained
+ F:    drivers/platform/chrome/cros_ec_typec.c
+ CHROMEOS EC USB PD NOTIFY DRIVER
+ M:    Prashant Malani <pmalani@chromium.org>
+ S:    Maintained
+ F:    drivers/platform/chrome/cros_usbpd_notify.c
+ F:    include/linux/platform_data/cros_usbpd_notify.h
  CHRONTEL CH7322 CEC DRIVER
- M:    Jeff Chase <jnchase@google.com>
+ M:    Joe Tessler <jrt@google.com>
  L:    linux-media@vger.kernel.org
  S:    Maintained
  T:    git git://linuxtv.org/media_tree.git
@@@ -4445,6 -4516,17 +4516,17 @@@ L:    patches@opensource.cirrus.co
  S:    Maintained
  F:    sound/soc/codecs/cs*
  
+ CIRRUS LOGIC DSP FIRMWARE DRIVER
+ M:    Simon Trimmer <simont@opensource.cirrus.com>
+ M:    Charles Keepax <ckeepax@opensource.cirrus.com>
+ M:    Richard Fitzgerald <rf@opensource.cirrus.com>
+ L:    patches@opensource.cirrus.com
+ S:    Supported
+ W:    https://github.com/CirrusLogic/linux-drivers/wiki
+ T:    git https://github.com/CirrusLogic/linux-drivers.git
+ F:    drivers/firmware/cirrus/*
+ F:    include/linux/firmware/cirrus/*
  CIRRUS LOGIC EP93XX ETHERNET DRIVER
  M:    Hartley Sweeten <hsweeten@visionengravers.com>
  L:    netdev@vger.kernel.org
@@@ -4594,11 -4676,10 +4676,10 @@@ COCCINELLE/Semantic Patches (SmPL
  M:    Julia Lawall <Julia.Lawall@inria.fr>
  M:    Gilles Muller <Gilles.Muller@inria.fr>
  M:    Nicolas Palix <nicolas.palix@imag.fr>
- M:    Michal Marek <michal.lkml@markovi.net>
- L:    cocci@systeme.lip6.fr (moderated for non-subscribers)
+ L:    cocci@inria.fr (moderated for non-subscribers)
  S:    Supported
- W:    http://coccinelle.lip6.fr/
- T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild.git misc
+ W:    https://coccinelle.gitlabpages.inria.fr/website/
+ T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jlawall/linux.git
  F:    Documentation/dev-tools/coccinelle.rst
  F:    scripts/coccicheck
  F:    scripts/coccinelle/
@@@ -4656,7 -4737,7 +4737,7 @@@ W:      http://linux-cifs.samba.org
  T:    git git://git.samba.org/sfrench/cifs-2.6.git
  F:    Documentation/admin-guide/cifs/
  F:    fs/cifs/
- F:    fs/cifs_common/
+ F:    fs/smbfs_common/
  
  COMPACTPCI HOTPLUG CORE
  M:    Scott Murray <scott@spiteful.org>
@@@ -4804,7 -4885,8 +4885,8 @@@ F:      Documentation/ABI/testing/sysfs-bus-
  F:    Documentation/driver-api/generic-counter.rst
  F:    drivers/counter/
  F:    include/linux/counter.h
- F:    include/linux/counter_enum.h
+ F:    include/uapi/linux/counter.h
+ F:    tools/counter/
  
  CP2615 I2C DRIVER
  M:    Bence Csókás <bence98@sch.bme.hu>
@@@ -5122,6 -5204,13 +5204,13 @@@ L:    linux-input@vger.kernel.or
  S:    Maintained
  F:    drivers/input/touchscreen/cy8ctma140.c
  
+ CYPRESS STREETFIGHTER TOUCHKEYS DRIVER
+ M:    Yassine Oudjana <y.oudjana@protonmail.com>
+ L:    linux-input@vger.kernel.org
+ S:    Maintained
+ F:    Documentation/devicetree/bindings/input/cypress-sf.yaml
+ F:    drivers/input/keyboard/cypress-sf.c
  CYTTSP TOUCHSCREEN DRIVER
  M:    Linus Walleij <linus.walleij@linaro.org>
  L:    linux-input@vger.kernel.org
@@@ -5155,7 -5244,7 +5244,7 @@@ F:      net/ax25/ax25_timer.
  F:    net/ax25/sysctl_net_ax25.c
  
  DATA ACCESS MONITOR
- M:    SeongJae Park <sjpark@amazon.de>
+ M:    SeongJae Park <sj@kernel.org>
  L:    linux-mm@kvack.org
  S:    Maintained
  F:    Documentation/admin-guide/mm/damon/
@@@ -5452,6 -5541,19 +5541,19 @@@ F:    include/net/devlink.
  F:    include/uapi/linux/devlink.h
  F:    net/core/devlink.c
  
+ DH ELECTRONICS IMX6 DHCOM BOARD SUPPORT
+ M:    Christoph Niedermaier <cniedermaier@dh-electronics.com>
+ L:    kernel@dh-electronics.com
+ S:    Maintained
+ F:    arch/arm/boot/dts/imx6*-dhcom-*
+ DH ELECTRONICS STM32MP1 DHCOM/DHCOR BOARD SUPPORT
+ M:    Marek Vasut <marex@denx.de>
+ L:    kernel@dh-electronics.com
+ S:    Maintained
+ F:    arch/arm/boot/dts/stm32mp1*-dhcom-*
+ F:    arch/arm/boot/dts/stm32mp1*-dhcor-*
  DIALOG SEMICONDUCTOR DRIVERS
  M:    Support Opensource <support.opensource@diasemi.com>
  S:    Supported
@@@ -6147,8 -6249,7 +6249,7 @@@ T:      git git://anongit.freedesktop.org/dr
  F:    Documentation/devicetree/bindings/display/
  F:    Documentation/devicetree/bindings/gpu/
  F:    Documentation/gpu/
- F:    drivers/gpu/drm/
- F:    drivers/gpu/vga/
+ F:    drivers/gpu/
  F:    include/drm/
  F:    include/linux/vga*
  F:    include/uapi/drm/
@@@ -6292,6 -6393,7 +6393,7 @@@ L:      linux-tegra@vger.kernel.or
  S:    Supported
  T:    git git://anongit.freedesktop.org/tegra/linux.git
  F:    Documentation/devicetree/bindings/display/tegra/nvidia,tegra20-host1x.txt
+ F:    Documentation/devicetree/bindings/gpu/host1x/
  F:    drivers/gpu/drm/tegra/
  F:    drivers/gpu/host1x/
  F:    include/linux/host1x.h
@@@ -6697,7 -6799,7 +6799,7 @@@ S:      Supporte
  F:    drivers/edac/dmc520_edac.c
  
  EDAC-E752X
- M:    Mark Gross <mark.gross@intel.com>
+ M:    Mark Gross <markgross@kernel.org>
  L:    linux-edac@vger.kernel.org
  S:    Maintained
  F:    drivers/edac/e752x_edac.c
@@@ -7020,7 -7122,6 +7122,6 @@@ F:      drivers/net/mdio/fwnode_mdio.
  F:    drivers/net/mdio/of_mdio.c
  F:    drivers/net/pcs/
  F:    drivers/net/phy/
- F:    drivers/of/of_net.c
  F:    include/dt-bindings/net/qca-ar803x.h
  F:    include/linux/*mdio*.h
  F:    include/linux/mdio/*.h
@@@ -7032,6 -7133,21 +7133,21 @@@ F:    include/linux/platform_data/mdio-gpi
  F:    include/trace/events/mdio.h
  F:    include/uapi/linux/mdio.h
  F:    include/uapi/linux/mii.h
+ F:    net/core/of_net.c
+ EXEC & BINFMT API
+ R:    Eric Biederman <ebiederm@xmission.com>
+ R:    Kees Cook <keescook@chromium.org>
+ F:    arch/alpha/kernel/binfmt_loader.c
+ F:    arch/x86/ia32/ia32_aout.c
+ F:    fs/*binfmt_*.c
+ F:    fs/exec.c
+ F:    include/linux/binfmts.h
+ F:    include/linux/elf.h
+ F:    include/uapi/linux/binfmts.h
+ F:    tools/testing/selftests/exec/
+ N:    asm/elf.h
+ N:    binfmt
  
  EXFAT FILE SYSTEM
  M:    Namjae Jeon <linkinjeon@kernel.org>
@@@ -7337,6 -7453,15 +7453,15 @@@ L:    netdev@vger.kernel.or
  S:    Maintained
  F:    drivers/net/ethernet/nvidia/*
  
+ FORTIFY_SOURCE
+ M:    Kees Cook <keescook@chromium.org>
+ L:    linux-hardening@vger.kernel.org
+ S:    Supported
+ F:    include/linux/fortify-string.h
+ F:    lib/test_fortify/*
+ F:    scripts/test_fortify.sh
+ K:    \b__NO_FORTIFY\b
  FPGA DFL DRIVERS
  M:    Wu Hao <hao.wu@intel.com>
  R:    Tom Rix <trix@redhat.com>
@@@ -7351,10 -7476,11 +7476,11 @@@ F:   include/uapi/linux/fpga-dfl.
  
  FPGA MANAGER FRAMEWORK
  M:    Moritz Fischer <mdf@kernel.org>
+ M:    Wu Hao <hao.wu@intel.com>
+ M:    Xu Yilun <yilun.xu@intel.com>
  R:    Tom Rix <trix@redhat.com>
  L:    linux-fpga@vger.kernel.org
  S:    Maintained
- W:    http://www.rocketboards.org
  Q:    http://patchwork.kernel.org/project/linux-fpga/list/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mdf/linux-fpga.git
  F:    Documentation/devicetree/bindings/fpga/
@@@ -7448,7 -7574,7 +7574,7 @@@ FREESCALE IMX / MXC FEC DRIVE
  M:    Joakim Zhang <qiangqing.zhang@nxp.com>
  L:    netdev@vger.kernel.org
  S:    Maintained
- F:    Documentation/devicetree/bindings/net/fsl-fec.txt
+ F:    Documentation/devicetree/bindings/net/fsl,fec.yaml
  F:    drivers/net/ethernet/freescale/fec.h
  F:    drivers/net/ethernet/freescale/fec_main.c
  F:    drivers/net/ethernet/freescale/fec_ptp.c
@@@ -7732,6 -7858,7 +7858,7 @@@ M:      Ingo Molnar <mingo@redhat.com
  R:    Peter Zijlstra <peterz@infradead.org>
  R:    Darren Hart <dvhart@infradead.org>
  R:    Davidlohr Bueso <dave@stgolabs.net>
+ R:    André Almeida <andrealmeid@collabora.com>
  L:    linux-kernel@vger.kernel.org
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git locking/core
@@@ -7739,7 -7866,7 +7866,7 @@@ F:      Documentation/locking/*futex
  F:    include/asm-generic/futex.h
  F:    include/linux/futex.h
  F:    include/uapi/linux/futex.h
- F:    kernel/futex.c
+ F:    kernel/futex/*
  F:    tools/perf/bench/futex*
  F:    tools/testing/selftests/futex/
  
@@@ -7942,9 -8069,10 +8069,10 @@@ F:    drivers/media/usb/go7007
  
  GOODIX TOUCHSCREEN
  M:    Bastien Nocera <hadess@hadess.net>
+ M:    Hans de Goede <hdegoede@redhat.com>
  L:    linux-input@vger.kernel.org
  S:    Maintained
- F:    drivers/input/touchscreen/goodix.c
+ F:    drivers/input/touchscreen/goodix*
  
  GOOGLE ETHERNET DRIVERS
  M:    Jeroen de Borst <jeroendb@google.com>
@@@ -8000,7 -8128,7 +8128,7 @@@ F:      include/linux/gpio/regmap.
  
  GPIO SUBSYSTEM
  M:    Linus Walleij <linus.walleij@linaro.org>
- M:    Bartosz Golaszewski <bgolaszewski@baylibre.com>
+ M:    Bartosz Golaszewski <brgl@bgdev.pl>
  L:    linux-gpio@vger.kernel.org
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio.git
@@@ -8205,7 -8333,7 +8333,7 @@@ T:      git git://linuxtv.org/anttip/media_t
  F:    drivers/media/usb/hackrf/
  
  HANTRO VPU CODEC DRIVER
- M:    Ezequiel Garcia <ezequiel@collabora.com>
+ M:    Ezequiel Garcia <ezequiel@vanguardiasur.com.ar>
  M:    Philipp Zabel <p.zabel@pengutronix.de>
  L:    linux-media@vger.kernel.org
  L:    linux-rockchip@lists.infradead.org
@@@ -8228,6 -8356,7 +8356,7 @@@ L:      linux-hwmon@vger.kernel.or
  S:    Maintained
  W:    http://hwmon.wiki.kernel.org/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git
+ F:    Documentation/ABI/testing/sysfs-class-hwmon
  F:    Documentation/devicetree/bindings/hwmon/
  F:    Documentation/hwmon/
  F:    drivers/hwmon/
@@@ -8464,7 -8593,6 +8593,6 @@@ M:      John Stultz <john.stultz@linaro.org
  L:    linux-kernel@vger.kernel.org
  S:    Maintained
  F:    drivers/misc/hisi_hikey_usb.c
- F:    Documentation/devicetree/bindings/misc/hisilicon-hikey-usb.yaml
  
  HISILICON PMU DRIVER
  M:    Shaokun Zhang <zhangshaokun@hisilicon.com>
@@@ -8622,9 -8750,8 +8750,8 @@@ F:      Documentation/devicetree/bindings/ii
  F:    drivers/iio/humidity/hts221*
  
  HUAWEI ETHERNET DRIVER
- M:    Bin Luo <luobin9@huawei.com>
  L:    netdev@vger.kernel.org
- S:    Supported
+ S:    Orphan
  F:    Documentation/networking/device_drivers/ethernet/huawei/hinic.rst
  F:    drivers/net/ethernet/huawei/hinic/
  
@@@ -8674,6 -8801,12 +8801,12 @@@ S:    Maintaine
  T:    git git://linuxtv.org/media_tree.git
  F:    drivers/media/i2c/hi556.c
  
+ HYNIX HI846 SENSOR DRIVER
+ M:    Martin Kepplinger <martin.kepplinger@puri.sm>
+ L:    linux-media@vger.kernel.org
+ S:    Maintained
+ F:    drivers/media/i2c/hi846.c
  Hyper-V/Azure CORE AND DRIVERS
  M:    "K. Y. Srinivasan" <kys@microsoft.com>
  M:    Haiyang Zhang <haiyangz@microsoft.com>
@@@ -8721,8 -8854,7 +8854,7 @@@ S:      Supporte
  Q:    http://patchwork.ozlabs.org/project/linux-mtd/list/
  C:    irc://irc.oftc.net/mtd
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git cfi/next
- F:    Documentation/devicetree/bindings/mtd/cypress,hyperflash.txt
- F:    Documentation/devicetree/bindings/mtd/ti,am654-hbmc.txt
+ F:    Documentation/devicetree/bindings/mtd/ti,am654-hbmc.yaml
  F:    drivers/mtd/hyperbus/
  F:    include/linux/mtd/hyperbus.h
  
@@@ -9316,7 -9448,7 +9448,7 @@@ S:      Maintaine
  F:    drivers/platform/x86/intel/atomisp2/led.c
  
  INTEL BIOS SAR INT1092 DRIVER
- M:    Shravan S <s.shravan@intel.com>
+ M:    Shravan Sudhakar <s.shravan@intel.com>
  M:    Intel Corporation <linuxwwan@intel.com>
  L:    platform-driver-x86@vger.kernel.org
  S:    Maintained
@@@ -9347,7 -9479,6 +9479,7 @@@ INTEL DRM DRIVERS (excluding Poulsbo, M
  M:    Jani Nikula <jani.nikula@linux.intel.com>
  M:    Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
  M:    Rodrigo Vivi <rodrigo.vivi@intel.com>
 +M:    Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com>
  L:    intel-gfx@lists.freedesktop.org
  S:    Supported
  W:    https://01.org/linuxgraphics/
@@@ -9494,6 -9625,12 +9626,12 @@@ L:    linux-crypto@vger.kernel.or
  S:    Maintained
  F:    drivers/crypto/ixp4xx_crypto.c
  
+ INTEL ISHTP ECLITE DRIVER
+ M:    Sumesh K Naduvalath <sumesh.k.naduvalath@intel.com>
+ L:    platform-driver-x86@vger.kernel.org
+ S:    Supported
+ F:    drivers/platform/x86/intel/ishtp_eclite.c
  INTEL IXP4XX QMGR, NPE, ETHERNET and HSS SUPPORT
  M:    Krzysztof Halasa <khalasa@piap.pl>
  S:    Maintained
@@@ -9507,14 -9644,14 +9645,14 @@@ F:   include/linux/soc/ixp4xx/qmgr.
  INTEL IXP4XX RANDOM NUMBER GENERATOR SUPPORT
  M:    Deepak Saxena <dsaxena@plexity.net>
  S:    Maintained
- F:    Documentation/devicetree/bindings/display/intel,ixp46x-rng.yaml
+ F:    Documentation/devicetree/bindings/rng/intel,ixp46x-rng.yaml
  F:    drivers/char/hw_random/ixp4xx-rng.c
  
  INTEL KEEM BAY DRM DRIVER
  M:    Anitha Chrisanthus <anitha.chrisanthus@intel.com>
  M:    Edmund Dea <edmund.j.dea@intel.com>
  S:    Maintained
- F:    Documentation/devicetree/bindings/display/intel,kmb_display.yaml
+ F:    Documentation/devicetree/bindings/display/intel,keembay-display.yaml
  F:    drivers/gpu/drm/kmb/
  
  INTEL KEEM BAY OCS AES/SM4 CRYPTO DRIVER
@@@ -9527,6 -9664,17 +9665,17 @@@ F:    drivers/crypto/keembay/keembay-ocs-a
  F:    drivers/crypto/keembay/ocs-aes.c
  F:    drivers/crypto/keembay/ocs-aes.h
  
+ INTEL KEEM BAY OCS ECC CRYPTO DRIVER
+ M:    Daniele Alessandrelli <daniele.alessandrelli@intel.com>
+ M:    Prabhjot Khurana <prabhjot.khurana@intel.com>
+ M:    Mark Gross <mgross@linux.intel.com>
+ S:    Maintained
+ F:    Documentation/devicetree/bindings/crypto/intel,keembay-ocs-ecc.yaml
+ F:    drivers/crypto/keembay/Kconfig
+ F:    drivers/crypto/keembay/Makefile
+ F:    drivers/crypto/keembay/keembay-ocs-ecc.c
+ F:    drivers/crypto/keembay/ocs-ecc-curve-defs.h
  INTEL KEEM BAY OCS HCU CRYPTO DRIVER
  M:    Daniele Alessandrelli <daniele.alessandrelli@intel.com>
  M:    Declan Murphy <declan.murphy@intel.com>
@@@ -9639,7 -9787,7 +9788,7 @@@ F:      include/uapi/linux/isst_if.
  F:    tools/power/x86/intel-speed-select/
  
  INTEL STRATIX10 FIRMWARE DRIVERS
- M:    Richard Gong <richard.gong@linux.intel.com>
+ M:    Dinh Nguyen <dinguyen@kernel.org>
  L:    linux-kernel@vger.kernel.org
  S:    Maintained
  F:    Documentation/ABI/testing/sysfs-devices-platform-stratix10-rsu
@@@ -10010,6 -10158,7 +10159,7 @@@ JC42.4 TEMPERATURE SENSOR DRIVE
  M:    Guenter Roeck <linux@roeck-us.net>
  L:    linux-hwmon@vger.kernel.org
  S:    Maintained
+ F:    Documentation/devicetree/bindings/hwmon/jedec,jc42.yaml
  F:    Documentation/hwmon/jc42.rst
  F:    drivers/hwmon/jc42.c
  
@@@ -10049,6 -10198,7 +10199,7 @@@ F:   include/linux/jbd2.
  JPU V4L2 MEM2MEM DRIVER FOR RENESAS
  M:    Mikhail Ulyanov <mikhail.ulyanov@cogentembedded.com>
  L:    linux-media@vger.kernel.org
+ L:    linux-renesas-soc@vger.kernel.org
  S:    Maintained
  F:    drivers/media/platform/rcar_jpu.c
  
@@@ -10209,8 -10359,8 +10360,8 @@@ M:   Hyunchul Lee <hyc.lee@gmail.com
  L:    linux-cifs@vger.kernel.org
  S:    Maintained
  T:    git git://git.samba.org/ksmbd.git
- F:    fs/cifs_common/
  F:    fs/ksmbd/
+ F:    fs/smbfs_common/
  
  KERNEL UNIT TESTING FRAMEWORK (KUnit)
  M:    Brendan Higgins <brendanhiggins@google.com>
@@@ -10275,21 -10425,29 +10426,29 @@@ F:        arch/mips/include/uapi/asm/kvm
  F:    arch/mips/kvm/
  
  KERNEL VIRTUAL MACHINE FOR POWERPC (KVM/powerpc)
- M:    Paul Mackerras <paulus@ozlabs.org>
- L:    kvm-ppc@vger.kernel.org
- S:    Supported
- W:    http://www.linux-kvm.org/
- T:    git git://github.com/agraf/linux-2.6.git
+ L:    linuxppc-dev@lists.ozlabs.org
+ T:    git git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git topic/ppc-kvm
  F:    arch/powerpc/include/asm/kvm*
  F:    arch/powerpc/include/uapi/asm/kvm*
  F:    arch/powerpc/kernel/kvm*
  F:    arch/powerpc/kvm/
  
+ KERNEL VIRTUAL MACHINE FOR RISC-V (KVM/riscv)
+ M:    Anup Patel <anup.patel@wdc.com>
+ R:    Atish Patra <atish.patra@wdc.com>
+ L:    kvm@vger.kernel.org
+ L:    kvm-riscv@lists.infradead.org
+ L:    linux-riscv@lists.infradead.org
+ S:    Maintained
+ T:    git git://github.com/kvm-riscv/linux.git
+ F:    arch/riscv/include/asm/kvm*
+ F:    arch/riscv/include/uapi/asm/kvm*
+ F:    arch/riscv/kvm/
  KERNEL VIRTUAL MACHINE for s390 (KVM/s390)
- M:    Christian Borntraeger <borntraeger@de.ibm.com>
+ M:    Christian Borntraeger <borntraeger@linux.ibm.com>
  M:    Janosch Frank <frankja@linux.ibm.com>
  R:    David Hildenbrand <david@redhat.com>
- R:    Cornelia Huck <cohuck@redhat.com>
  R:    Claudio Imbrenda <imbrenda@linux.ibm.com>
  L:    kvm@vger.kernel.org
  S:    Supported
@@@ -10453,10 -10611,13 +10612,13 @@@ M:        Anil S Keshavamurthy <anil.s.keshava
  M:    "David S. Miller" <davem@davemloft.net>
  M:    Masami Hiramatsu <mhiramat@kernel.org>
  S:    Maintained
+ T:    git git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace.git
  F:    Documentation/trace/kprobes.rst
  F:    include/asm-generic/kprobes.h
  F:    include/linux/kprobes.h
  F:    kernel/kprobes.c
+ F:    lib/test_kprobes.c
+ F:    samples/kprobes
  
  KS0108 LCD CONTROLLER DRIVER
  M:    Miguel Ojeda <ojeda@kernel.org>
@@@ -10646,11 -10807,6 +10808,6 @@@ F:  drivers/ata
  F:    include/linux/ata.h
  F:    include/linux/libata.h
  
- LIBLOCKDEP
- M:    Sasha Levin <alexander.levin@microsoft.com>
- S:    Maintained
- F:    tools/lib/lockdep/
  LIBNVDIMM BLK: MMIO-APERTURE DRIVER
  M:    Dan Williams <dan.j.williams@intel.com>
  M:    Vishal Verma <vishal.l.verma@intel.com>
@@@ -10904,7 -11060,7 +11061,7 @@@ LM90 HARDWARE MONITOR DRIVE
  M:    Jean Delvare <jdelvare@suse.com>
  L:    linux-hwmon@vger.kernel.org
  S:    Maintained
- F:    Documentation/devicetree/bindings/hwmon/lm90.txt
+ F:    Documentation/devicetree/bindings/hwmon/national,lm90.yaml
  F:    Documentation/hwmon/lm90.rst
  F:    drivers/hwmon/lm90.c
  F:    include/dt-bindings/thermal/lm90.h
@@@ -11163,6 -11319,7 +11320,7 @@@ S:   Maintaine
  F:    Documentation/devicetree/bindings/net/dsa/marvell.txt
  F:    Documentation/networking/devlink/mv88e6xxx.rst
  F:    drivers/net/dsa/mv88e6xxx/
+ F:    include/linux/dsa/mv88e6xxx.h
  F:    include/linux/platform_data/mv88e6xxx.h
  
  MARVELL ARMADA 3700 PHY DRIVERS
@@@ -11287,7 -11444,6 +11445,6 @@@ F:   Documentation/networking/device_driv
  F:    drivers/net/ethernet/marvell/octeontx2/af/
  
  MARVELL PRESTERA ETHERNET SWITCH DRIVER
- M:    Vadym Kochan <vkochan@marvell.com>
  M:    Taras Chornyi <tchornyi@marvell.com>
  S:    Supported
  W:    https://github.com/Marvell-switching/switchdev-prestera
@@@ -11381,8 -11537,29 +11538,29 @@@ S: Maintaine
  F:    Documentation/devicetree/bindings/iio/proximity/maxbotix,mb1232.yaml
  F:    drivers/iio/proximity/mb1232.c
  
+ MAXIM MAX17040 FAMILY FUEL GAUGE DRIVERS
+ R:    Iskren Chernev <iskren.chernev@gmail.com>
+ R:    Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
+ R:    Marek Szyprowski <m.szyprowski@samsung.com>
+ R:    Matheus Castello <matheus@castello.eng.br>
+ L:    linux-pm@vger.kernel.org
+ S:    Maintained
+ F:    Documentation/devicetree/bindings/power/supply/maxim,max17040.yaml
+ F:    drivers/power/supply/max17040_battery.c
+ MAXIM MAX17042 FAMILY FUEL GAUGE DRIVERS
+ R:    Hans de Goede <hdegoede@redhat.com>
+ R:    Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
+ R:    Marek Szyprowski <m.szyprowski@samsung.com>
+ R:    Sebastian Krzyszkowiak <sebastian.krzyszkowiak@puri.sm>
+ R:    Purism Kernel Team <kernel@puri.sm>
+ L:    linux-pm@vger.kernel.org
+ S:    Maintained
+ F:    Documentation/devicetree/bindings/power/supply/maxim,max17042.yaml
+ F:    drivers/power/supply/max17042_battery.c
  MAXIM MAX77650 PMIC MFD DRIVER
- M:    Bartosz Golaszewski <bgolaszewski@baylibre.com>
+ M:    Bartosz Golaszewski <brgl@bgdev.pl>
  L:    linux-kernel@vger.kernel.org
  S:    Maintained
  F:    Documentation/devicetree/bindings/*/*max77650.yaml
@@@ -11688,6 -11865,7 +11866,7 @@@ T:   git git://linuxtv.org/media_tree.gi
  F:    Documentation/devicetree/bindings/media/renesas,csi2.yaml
  F:    Documentation/devicetree/bindings/media/renesas,isp.yaml
  F:    Documentation/devicetree/bindings/media/renesas,vin.yaml
+ F:    drivers/media/platform/rcar-isp.c
  F:    drivers/media/platform/rcar-vin/
  
  MEDIA DRIVERS FOR RENESAS - VSP1
@@@ -11833,7 -12011,9 +12012,9 @@@ F:   drivers/mmc/host/mtk-sd.
  MEDIATEK MT76 WIRELESS LAN DRIVER
  M:    Felix Fietkau <nbd@nbd.name>
  M:    Lorenzo Bianconi <lorenzo.bianconi83@gmail.com>
- R:    Ryder Lee <ryder.lee@mediatek.com>
+ M:    Ryder Lee <ryder.lee@mediatek.com>
+ R:    Shayne Chen <shayne.chen@mediatek.com>
+ R:    Sean Wang <sean.wang@mediatek.com>
  L:    linux-wireless@vger.kernel.org
  S:    Maintained
  F:    drivers/net/wireless/mediatek/mt76/
@@@ -11857,6 -12037,12 +12038,12 @@@ S: Maintaine
  F:    Documentation/devicetree/bindings/i2c/i2c-mt7621.txt
  F:    drivers/i2c/busses/i2c-mt7621.c
  
+ MEDIATEK MT7621 PCIE CONTROLLER DRIVER
+ M:    Sergio Paracuellos <sergio.paracuellos@gmail.com>
+ S:    Maintained
+ F:    Documentation/devicetree/bindings/pci/mediatek,mt7621-pcie.yaml
+ F:    drivers/pci/controller/pcie-mt7621.c
  MEDIATEK MT7621 PHY PCI DRIVER
  M:    Sergio Paracuellos <sergio.paracuellos@gmail.com>
  S:    Maintained
@@@ -11880,6 -12066,14 +12067,14 @@@ M: Sean Wang <sean.wang@mediatek.com
  S:    Maintained
  F:    drivers/char/hw_random/mtk-rng.c
  
+ MEDIATEK SMI DRIVER
+ M:    Yong Wu <yong.wu@mediatek.com>
+ L:    linux-mediatek@lists.infradead.org (moderated for non-subscribers)
+ S:    Supported
+ F:    Documentation/devicetree/bindings/memory-controllers/mediatek,smi*
+ F:    drivers/memory/mtk-smi.c
+ F:    include/soc/mediatek/smi.h
  MEDIATEK SWITCH DRIVER
  M:    Sean Wang <sean.wang@mediatek.com>
  M:    Landen Chao <Landen.Chao@mediatek.com>
@@@ -11994,7 -12188,7 +12189,7 @@@ F:   drivers/net/ethernet/mellanox/mlxfw
  
  MELLANOX HARDWARE PLATFORM SUPPORT
  M:    Hans de Goede <hdegoede@redhat.com>
- M:    Mark Gross <mgross@linux.intel.com>
+ M:    Mark Gross <markgross@kernel.org>
  M:    Vadim Pasternak <vadimp@nvidia.com>
  L:    platform-driver-x86@vger.kernel.org
  S:    Supported
@@@ -12206,7 -12400,8 +12401,8 @@@ F:   arch/arm64/boot/dts/marvell/armada-3
  
  MHI BUS
  M:    Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
- M:    Hemant Kumar <hemantk@codeaurora.org>
+ R:    Hemant Kumar <hemantk@codeaurora.org>
+ L:    mhi@lists.linux.dev
  L:    linux-arm-msm@vger.kernel.org
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mani/mhi.git
@@@ -12268,6 -12463,12 +12464,12 @@@ L: linux-crypto@vger.kernel.or
  S:    Maintained
  F:    drivers/crypto/atmel-ecc.*
  
+ MICROCHIP EIC DRIVER
+ M:    Claudiu Beznea <claudiu.beznea@microchip.com>
+ L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
+ S:    Supported
+ F:    drivers/irqchip/irq-mchp-eic.c
  MICROCHIP I2C DRIVER
  M:    Codrin Ciubotariu <codrin.ciubotariu@microchip.com>
  L:    linux-i2c@vger.kernel.org
@@@ -12446,7 -12647,7 +12648,7 @@@ F:   drivers/platform/surface/surface_gpe
  
  MICROSOFT SURFACE HARDWARE PLATFORM SUPPORT
  M:    Hans de Goede <hdegoede@redhat.com>
- M:    Mark Gross <mgross@linux.intel.com>
+ M:    Mark Gross <markgross@kernel.org>
  M:    Maximilian Luz <luzmaximilian@gmail.com>
  L:    platform-driver-x86@vger.kernel.org
  S:    Maintained
@@@ -12763,6 -12964,7 +12965,7 @@@ M:   Laurent Pinchart <laurent.pinchart@i
  L:    linux-media@vger.kernel.org
  S:    Maintained
  T:    git git://linuxtv.org/media_tree.git
+ F:    Documentation/devicetree/bindings/media/i2c/aptina,mt9p031.yaml
  F:    drivers/media/i2c/mt9p031.c
  F:    include/media/i2c/mt9p031.h
  
@@@ -13057,6 -13259,7 +13260,7 @@@ F:   include/linux/dsa
  F:    include/linux/platform_data/dsa.h
  F:    include/net/dsa.h
  F:    net/dsa/
+ F:    tools/testing/selftests/drivers/net/dsa/
  
  NETWORKING [GENERAL]
  M:    "David S. Miller" <davem@davemloft.net>
@@@ -13269,10 -13472,16 +13473,16 @@@ W:        http://www.netlab.is.tsukuba.ac.jp/~
  F:    Documentation/scsi/NinjaSCSI.rst
  F:    drivers/scsi/nsp32*
  
+ NINTENDO HID DRIVER
+ M:    Daniel J. Ogorchock <djogorchock@gmail.com>
+ L:    linux-input@vger.kernel.org
+ S:    Maintained
+ F:    drivers/hid/hid-nintendo*
  NIOS2 ARCHITECTURE
- M:    Ley Foon Tan <ley.foon.tan@intel.com>
+ M:    Dinh Nguyen <dinguyen@kernel.org>
  S:    Maintained
- T:    git git://git.kernel.org/pub/scm/linux/kernel/git/lftan/nios2.git
+ T:    git git://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux.git
  F:    arch/nios2/
  
  NITRO ENCLAVES (NE)
@@@ -13398,6 -13607,12 +13608,12 @@@ S: Maintaine
  F:    drivers/video/fbdev/nvidia/
  F:    drivers/video/fbdev/riva/
  
+ NVIDIA WMI EC BACKLIGHT DRIVER
+ M:    Daniel Dadap <ddadap@nvidia.com>
+ L:    platform-driver-x86@vger.kernel.org
+ S:    Supported
+ F:    drivers/platform/x86/nvidia-wmi-ec-backlight.c
  NVM EXPRESS DRIVER
  M:    Keith Busch <kbusch@kernel.org>
  M:    Jens Axboe <axboe@fb.com>
@@@ -13452,7 -13667,7 +13668,7 @@@ M:   Ashish Kumar <ashish.kumar@nxp.com
  R:    Yogesh Gaur <yogeshgaur.83@gmail.com>
  L:    linux-spi@vger.kernel.org
  S:    Maintained
- F:    Documentation/devicetree/bindings/spi/spi-nxp-fspi.txt
+ F:    Documentation/devicetree/bindings/spi/spi-nxp-fspi.yaml
  F:    drivers/spi/spi-nxp-fspi.c
  
  NXP FXAS21002C DRIVER
@@@ -13480,6 -13695,13 +13696,13 @@@ S: Maintaine
  F:    Documentation/devicetree/bindings/display/imx/nxp,imx8mq-dcss.yaml
  F:    drivers/gpu/drm/imx/dcss/
  
+ NXP i.MX 8QXP ADC DRIVER
+ M:    Cai Huoqing <caihuoqing@baidu.com>
+ L:    linux-iio@vger.kernel.org
+ S:    Supported
+ F:    Documentation/devicetree/bindings/iio/adc/nxp,imx8qxp-adc.yaml
+ F:    drivers/iio/adc/imx8qxp-adc.c
  NXP PF8100/PF8121A/PF8200 PMIC REGULATOR DEVICE DRIVER
  M:    Jagan Teki <jagan@amarulasolutions.com>
  S:    Maintained
@@@ -13535,6 -13757,7 +13758,7 @@@ NXP-NCI NFC DRIVE
  R:    Charles Gorand <charles.gorand@effinnov.com>
  L:    linux-nfc@lists.01.org (subscribers-only)
  S:    Supported
+ F:    Documentation/devicetree/bindings/net/nfc/nxp,nci.yaml
  F:    drivers/nfc/nxp-nci
  
  NXP i.MX 8QXP/8QM JPEG V4L2 DRIVER
@@@ -13542,7 -13765,7 +13766,7 @@@ M:   Mirela Rabulea <mirela.rabulea@nxp.c
  R:    NXP Linux Team <linux-imx@nxp.com>
  L:    linux-media@vger.kernel.org
  S:    Maintained
- F:    Documentation/devicetree/bindings/media/imx8-jpeg.yaml
+ F:    Documentation/devicetree/bindings/media/nxp,imx8-jpeg.yaml
  F:    drivers/media/platform/imx-jpeg
  
  NZXT-KRAKEN2 HARDWARE MONITORING DRIVER
@@@ -13815,6 -14038,13 +14039,13 @@@ S: Maintaine
  T:    git git://linuxtv.org/media_tree.git
  F:    drivers/media/i2c/ov13858.c
  
+ OMNIVISION OV13B10 SENSOR DRIVER
+ M:    Arec Kao <arec.kao@intel.com>
+ L:    linux-media@vger.kernel.org
+ S:    Maintained
+ T:    git git://linuxtv.org/media_tree.git
+ F:    drivers/media/i2c/ov13b10.c
  OMNIVISION OV2680 SENSOR DRIVER
  M:    Rui Miguel Silva <rmfrfs@gmail.com>
  L:    linux-media@vger.kernel.org
@@@ -14182,7 -14412,9 +14413,9 @@@ M:   Juergen Gross <jgross@suse.com
  M:    Deep Shah <sdeep@vmware.com>
  M:    "VMware, Inc." <pv-drivers@vmware.com>
  L:    virtualization@lists.linux-foundation.org
+ L:    x86@kernel.org
  S:    Supported
+ T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git x86/core
  F:    Documentation/virt/paravirt_ops.rst
  F:    arch/*/include/asm/paravirt*.h
  F:    arch/*/kernel/paravirt*
@@@ -14455,9 -14687,12 +14688,12 @@@ M: Lorenzo Pieralisi <lorenzo.pieralisi
  R:    Krzysztof Wilczyński <kw@linux.com>
  L:    linux-pci@vger.kernel.org
  S:    Supported
+ Q:    https://patchwork.kernel.org/project/linux-pci/list/
+ B:    https://bugzilla.kernel.org
+ C:    irc://irc.oftc.net/linux-pci
+ T:    git git://git.kernel.org/pub/scm/linux/kernel/git/lpieralisi/pci.git
  F:    Documentation/PCI/endpoint/*
  F:    Documentation/misc-devices/pci-endpoint-test.rst
- T:    git git://git.kernel.org/pub/scm/linux/kernel/git/kishon/pci-endpoint.git
  F:    drivers/misc/pci_endpoint_test.c
  F:    drivers/pci/endpoint/
  F:    tools/pci/
@@@ -14503,15 -14738,21 +14739,21 @@@ R:        Rob Herring <robh@kernel.org
  R:    Krzysztof Wilczyński <kw@linux.com>
  L:    linux-pci@vger.kernel.org
  S:    Supported
- Q:    http://patchwork.ozlabs.org/project/linux-pci/list/
- T:    git git://git.kernel.org/pub/scm/linux/kernel/git/lpieralisi/pci.git/
+ Q:    https://patchwork.kernel.org/project/linux-pci/list/
+ B:    https://bugzilla.kernel.org
+ C:    irc://irc.oftc.net/linux-pci
+ T:    git git://git.kernel.org/pub/scm/linux/kernel/git/lpieralisi/pci.git
  F:    drivers/pci/controller/
+ F:    drivers/pci/pci-bridge-emul.c
+ F:    drivers/pci/pci-bridge-emul.h
  
  PCI SUBSYSTEM
  M:    Bjorn Helgaas <bhelgaas@google.com>
  L:    linux-pci@vger.kernel.org
  S:    Supported
- Q:    http://patchwork.ozlabs.org/project/linux-pci/list/
+ Q:    https://patchwork.kernel.org/project/linux-pci/list/
+ B:    https://bugzilla.kernel.org
+ C:    irc://irc.oftc.net/linux-pci
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci.git
  F:    Documentation/PCI/
  F:    Documentation/devicetree/bindings/pci/
@@@ -14611,7 -14852,15 +14853,15 @@@ M: Stanimir Varbanov <svarbanov@mm-sol.
  L:    linux-pci@vger.kernel.org
  L:    linux-arm-msm@vger.kernel.org
  S:    Maintained
- F:    drivers/pci/controller/dwc/*qcom*
+ F:    drivers/pci/controller/dwc/pcie-qcom.c
+ PCIE ENDPOINT DRIVER FOR QUALCOMM
+ M:    Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
+ L:    linux-pci@vger.kernel.org
+ L:    linux-arm-msm@vger.kernel.org
+ S:    Maintained
+ F:    Documentation/devicetree/bindings/pci/qcom,pcie-ep.yaml
+ F:    drivers/pci/controller/dwc/pcie-qcom-ep.c
  
  PCIE DRIVER FOR ROCKCHIP
  M:    Shawn Lin <shawn.lin@rock-chips.com>
@@@ -14868,13 -15117,6 +15118,6 @@@ L:  linux-omap@vger.kernel.or
  S:    Maintained
  F:    drivers/pinctrl/pinctrl-single.c
  
- PIN CONTROLLER - ST SPEAR
- M:    Viresh Kumar <vireshk@kernel.org>
- L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
- S:    Maintained
- W:    http://www.st.com/spear
- F:    drivers/pinctrl/spear/
  PKTCDVD DRIVER
  M:    linux-block@vger.kernel.org
  S:    Orphan
@@@ -14923,7 -15165,6 +15166,6 @@@ S:   Maintaine
  W:    http://hwmon.wiki.kernel.org/
  W:    http://www.roeck-us.net/linux/drivers/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git
- F:    Documentation/devicetree/bindings/hwmon/ibm,cffps1.txt
  F:    Documentation/devicetree/bindings/hwmon/ltc2978.txt
  F:    Documentation/devicetree/bindings/hwmon/max31785.txt
  F:    Documentation/hwmon/adm1275.rst
@@@ -15162,7 -15403,7 +15404,7 @@@ S:   Maintaine
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git for-next/pstore
  F:    Documentation/admin-guide/ramoops.rst
  F:    Documentation/admin-guide/pstore-blk.rst
- F:    Documentation/devicetree/bindings/reserved-memory/ramoops.txt
+ F:    Documentation/devicetree/bindings/reserved-memory/ramoops.yaml
  F:    drivers/acpi/apei/erst.c
  F:    drivers/firmware/efi/efi-pstore.c
  F:    fs/pstore/
@@@ -15352,7 -15593,7 +15594,7 @@@ F:   drivers/scsi/qedi
  
  QLOGIC QL4xxx ETHERNET DRIVER
  M:    Ariel Elior <aelior@marvell.com>
- M:    GR-everest-linux-l2@marvell.com
+ M:    Manish Chopra <manishc@marvell.com>
  L:    netdev@vger.kernel.org
  S:    Supported
  F:    drivers/net/ethernet/qlogic/qed/
@@@ -15472,6 -15713,7 +15714,7 @@@ M:   ath9k-devel@qca.qualcomm.co
  L:    linux-wireless@vger.kernel.org
  S:    Supported
  W:    https://wireless.wiki.kernel.org/en/users/Drivers/ath9k
+ F:    Documentation/devicetree/bindings/net/wireless/qca,ath9k.yaml
  F:    drivers/net/wireless/ath/ath9k/
  
  QUALCOMM CAMERA SUBSYSTEM DRIVER
@@@ -15588,6 -15830,14 +15831,14 @@@ S: Maintaine
  F:    Documentation/devicetree/bindings/regulator/vqmmc-ipq4019-regulator.yaml
  F:    drivers/regulator/vqmmc-ipq4019-regulator.c
  
+ QUALCOMM NAND CONTROLLER DRIVER
+ M:    Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
+ L:    linux-mtd@lists.infradead.org
+ L:    linux-arm-msm@vger.kernel.org
+ S:    Maintained
+ F:    Documentation/devicetree/bindings/mtd/qcom,nandc.yaml
+ F:    drivers/mtd/nand/raw/qcom_nandc.c
  QUALCOMM RMNET DRIVER
  M:    Subash Abhinov Kasiviswanathan <subashab@codeaurora.org>
  M:    Sean Tranchetti <stranche@codeaurora.org>
@@@ -15893,6 -16143,12 +16144,12 @@@ L: linux-wireless@vger.kernel.or
  S:    Maintained
  F:    drivers/net/wireless/realtek/rtw88/
  
+ REALTEK WIRELESS DRIVER (rtw89)
+ M:    Ping-Ke Shih <pkshih@realtek.com>
+ L:    linux-wireless@vger.kernel.org
+ S:    Maintained
+ F:    drivers/net/wireless/realtek/rtw89/
  REDPINE WIRELESS DRIVER
  M:    Amitkumar Karwar <amitkarwar@gmail.com>
  M:    Siva Rebbagondla <siva8118@gmail.com>
@@@ -15920,7 -16176,7 +16177,7 @@@ M:   Bjorn Andersson <bjorn.andersson@lin
  M:    Mathieu Poirier <mathieu.poirier@linaro.org>
  L:    linux-remoteproc@vger.kernel.org
  S:    Maintained
- T:    git git://git.kernel.org/pub/scm/linux/kernel/git/andersson/remoteproc.git rproc-next
+ T:    git https://git.kernel.org/pub/scm/linux/kernel/git/remoteproc/linux.git rproc-next
  F:    Documentation/ABI/testing/sysfs-class-remoteproc
  F:    Documentation/devicetree/bindings/remoteproc/
  F:    Documentation/staging/remoteproc.rst
@@@ -15934,7 -16190,7 +16191,7 @@@ M:   Bjorn Andersson <bjorn.andersson@lin
  M:    Mathieu Poirier <mathieu.poirier@linaro.org>
  L:    linux-remoteproc@vger.kernel.org
  S:    Maintained
- T:    git git://git.kernel.org/pub/scm/linux/kernel/git/andersson/remoteproc.git rpmsg-next
+ T:    git https://git.kernel.org/pub/scm/linux/kernel/git/remoteproc/linux.git rpmsg-next
  F:    Documentation/ABI/testing/sysfs-bus-rpmsg
  F:    Documentation/staging/rpmsg.rst
  F:    drivers/rpmsg/
@@@ -16113,6 -16369,13 +16370,13 @@@ F: Documentation/ABI/*/sysfs-driver-hid
  F:    drivers/hid/hid-roccat*
  F:    include/linux/hid-roccat*
  
+ ROCKCHIP I2S TDM DRIVER
+ M:    Nicolas Frattaroli <frattaroli.nicolas@gmail.com>
+ L:    linux-rockchip@lists.infradead.org
+ S:    Maintained
+ F:    Documentation/devicetree/bindings/sound/rockchip,i2s-tdm.yaml
+ F:    sound/soc/rockchip/rockchip_i2s_tdm.*
  ROCKCHIP ISP V1 DRIVER
  M:    Helen Koike <helen.koike@collabora.com>
  M:    Dafna Hirschfeld <dafna.hirschfeld@collabora.com>
@@@ -16127,7 -16390,7 +16391,7 @@@ F:   include/uapi/linux/rkisp1-config.
  
  ROCKCHIP RASTER 2D GRAPHIC ACCELERATION UNIT DRIVER
  M:    Jacob Chen <jacob-chen@iotwrt.com>
- M:    Ezequiel Garcia <ezequiel@collabora.com>
+ M:    Ezequiel Garcia <ezequiel@vanguardiasur.com.ar>
  L:    linux-media@vger.kernel.org
  L:    linux-rockchip@lists.infradead.org
  S:    Maintained
@@@ -16135,7 -16398,7 +16399,7 @@@ F:   Documentation/devicetree/bindings/me
  F:    drivers/media/platform/rockchip/rga/
  
  ROCKCHIP VIDEO DECODER DRIVER
- M:    Ezequiel Garcia <ezequiel@collabora.com>
+ M:    Ezequiel Garcia <ezequiel@vanguardiasur.com.ar>
  L:    linux-media@vger.kernel.org
  L:    linux-rockchip@lists.infradead.org
  S:    Maintained
@@@ -16310,7 -16573,8 +16574,8 @@@ F:   drivers/video/fbdev/savage
  S390
  M:    Heiko Carstens <hca@linux.ibm.com>
  M:    Vasily Gorbik <gor@linux.ibm.com>
- M:    Christian Borntraeger <borntraeger@de.ibm.com>
+ M:    Christian Borntraeger <borntraeger@linux.ibm.com>
+ R:    Alexander Gordeev <agordeev@linux.ibm.com>
  L:    linux-s390@vger.kernel.org
  S:    Supported
  W:    http://www.ibm.com/developerworks/linux/linux390/
@@@ -16389,7 -16653,6 +16654,6 @@@ F:   drivers/s390/crypto/vfio_ap_ops.
  F:    drivers/s390/crypto/vfio_ap_private.h
  
  S390 VFIO-CCW DRIVER
- M:    Cornelia Huck <cohuck@redhat.com>
  M:    Eric Farman <farman@linux.ibm.com>
  M:    Matthew Rosato <mjrosato@linux.ibm.com>
  R:    Halil Pasic <pasic@linux.ibm.com>
@@@ -16518,10 -16781,11 +16782,11 @@@ M:        Bartlomiej Zolnierkiewicz <b.zolnier
  L:    linux-kernel@vger.kernel.org
  L:    linux-samsung-soc@vger.kernel.org
  S:    Supported
- F:    Documentation/devicetree/bindings/clock/samsung,s2mps11.txt
- F:    Documentation/devicetree/bindings/mfd/samsung,sec-core.txt
- F:    Documentation/devicetree/bindings/regulator/samsung,s2m*.txt
- F:    Documentation/devicetree/bindings/regulator/samsung,s5m*.txt
+ F:    Documentation/devicetree/bindings/clock/samsung,s2mps11.yaml
+ F:    Documentation/devicetree/bindings/mfd/samsung,s2m*.yaml
+ F:    Documentation/devicetree/bindings/mfd/samsung,s5m*.yaml
+ F:    Documentation/devicetree/bindings/regulator/samsung,s2m*.yaml
+ F:    Documentation/devicetree/bindings/regulator/samsung,s5m*.yaml
  F:    drivers/clk/clk-s2mps11.c
  F:    drivers/mfd/sec*.c
  F:    drivers/regulator/s2m*.c
@@@ -16666,13 -16930,6 +16931,6 @@@ M:  Lubomir Rintel <lkundrak@v3.sk
  S:    Supported
  F:    drivers/char/pcmcia/scr24x_cs.c
  
- SCSI CDROM DRIVER
- M:    Jens Axboe <axboe@kernel.dk>
- L:    linux-scsi@vger.kernel.org
- S:    Maintained
- W:    http://www.kernel.dk
- F:    drivers/scsi/sr*
  SCSI RDMA PROTOCOL (SRP) INITIATOR
  M:    Bart Van Assche <bvanassche@acm.org>
  L:    linux-rdma@vger.kernel.org
@@@ -16812,7 -17069,6 +17070,6 @@@ M:   Adrian Hunter <adrian.hunter@intel.c
  L:    linux-mmc@vger.kernel.org
  S:    Maintained
  F:    drivers/mmc/host/sdhci*
- F:    include/linux/mmc/sdhci*
  
  SECURE DIGITAL HOST CONTROLLER INTERFACE (SDHCI) MICROCHIP DRIVER
  M:    Eugen Hristev <eugen.hristev@microchip.com>
@@@ -16887,6 -17143,13 +17144,13 @@@ S: Maintaine
  F:    drivers/misc/phantom.c
  F:    include/uapi/linux/phantom.h
  
+ SENSEAIR SUNRISE 006-0-0007
+ M:    Jacopo Mondi <jacopo@jmondi.org>
+ S:    Maintained
+ F:    Documentation/ABI/testing/sysfs-bus-iio-chemical-sunrise-co2
+ F:    Documentation/devicetree/bindings/iio/chemical/senseair,sunrise.yaml
+ F:    drivers/iio/chemical/sunrise_co2.c
  SENSIRION SCD30 CARBON DIOXIDE SENSOR DRIVER
  M:    Tomasz Duszynski <tomasz.duszynski@octakon.com>
  S:    Maintained
@@@ -16896,6 -17159,12 +17160,12 @@@ F: drivers/iio/chemical/scd30_core.
  F:    drivers/iio/chemical/scd30_i2c.c
  F:    drivers/iio/chemical/scd30_serial.c
  
+ SENSIRION SCD4X CARBON DIOXIDE SENSOR DRIVER
+ M:    Roan van Dijk <roan@protonic.nl>
+ S:    Maintained
+ F:    Documentation/devicetree/bindings/iio/chemical/sensirion,scd4x.yaml
+ F:    drivers/iio/chemical/scd4x.c
  SENSIRION SGP40 GAS SENSOR DRIVER
  M:    Andreas Klinger <ak@it-klinger.de>
  S:    Maintained
@@@ -16971,7 -17240,6 +17241,6 @@@ F:   drivers/misc/sgi-xp
  
  SHARED MEMORY COMMUNICATIONS (SMC) SOCKETS
  M:    Karsten Graul <kgraul@linux.ibm.com>
- M:    Guvenc Gulce <guvenc@linux.ibm.com>
  L:    linux-s390@vger.kernel.org
  S:    Supported
  W:    http://www.ibm.com/developerworks/linux/linux390/
@@@ -17648,21 -17916,17 +17917,17 @@@ W:        https://github.com/linux-speakup/spe
  B:    https://github.com/linux-speakup/speakup/issues
  F:    drivers/accessibility/speakup/
  
- SPEAR CLOCK FRAMEWORK SUPPORT
- M:    Viresh Kumar <vireshk@kernel.org>
- L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
- S:    Maintained
- W:    http://www.st.com/spear
- F:    drivers/clk/spear/
- SPEAR PLATFORM SUPPORT
+ SPEAR PLATFORM/CLOCK/PINCTRL SUPPORT
  M:    Viresh Kumar <vireshk@kernel.org>
  M:    Shiraz Hashim <shiraz.linux.kernel@gmail.com>
+ M:    soc@kernel.org
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Maintained
  W:    http://www.st.com/spear
  F:    arch/arm/boot/dts/spear*
  F:    arch/arm/mach-spear/
+ F:    drivers/clk/spear/
+ F:    drivers/pinctrl/spear/
  
  SPI NOR SUBSYSTEM
  M:    Tudor Ambarus <tudor.ambarus@microchip.com>
@@@ -17674,6 -17938,7 +17939,7 @@@ W:   http://www.linux-mtd.infradead.org
  Q:    http://patchwork.ozlabs.org/project/linux-mtd/list/
  C:    irc://irc.oftc.net/mtd
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git spi-nor/next
+ F:    Documentation/devicetree/bindings/mtd/jedec,spi-nor.yaml
  F:    drivers/mtd/spi-nor/
  F:    include/linux/mtd/spi-nor.h
  
@@@ -17816,7 -18081,6 +18082,6 @@@ F:   drivers/staging/nvec
  
  STAGING - OLPC SECONDARY DISPLAY CONTROLLER (DCON)
  M:    Jens Frederich <jfrederich@gmail.com>
- M:    Daniel Drake <dsd@laptop.org>
  M:    Jon Nettleton <jon.nettleton@gmail.com>
  S:    Maintained
  W:    http://wiki.laptop.org/go/DCON
@@@ -17907,7 -18171,8 +18172,8 @@@ M:   Olivier Moysan <olivier.moysan@foss.
  M:    Arnaud Pouliquen <arnaud.pouliquen@foss.st.com>
  L:    alsa-devel@alsa-project.org (moderated for non-subscribers)
  S:    Maintained
- F:    Documentation/devicetree/bindings/iio/adc/st,stm32-*.yaml
+ F:    Documentation/devicetree/bindings/iio/adc/st,stm32-dfsdm-adc.yaml
+ F:    Documentation/devicetree/bindings/sound/st,stm32-*.yaml
  F:    sound/soc/stm/
  
  STM32 TIMER/LPTIMER DRIVERS
@@@ -17984,10 -18249,11 +18250,11 @@@ F:        Documentation/admin-guide/svga.rs
  F:    arch/x86/boot/video*
  
  SWIOTLB SUBSYSTEM
- M:    Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
+ M:    Christoph Hellwig <hch@infradead.org>
  L:    iommu@lists.linux-foundation.org
  S:    Supported
- T:    git git://git.kernel.org/pub/scm/linux/kernel/git/konrad/swiotlb.git
+ W:    http://git.infradead.org/users/hch/dma-mapping.git
+ T:    git git://git.infradead.org/users/hch/dma-mapping.git
  F:    arch/*/kernel/pci-swiotlb.c
  F:    include/linux/swiotlb.h
  F:    kernel/dma/swiotlb.c
@@@ -18003,7 -18269,7 +18270,7 @@@ F:   net/switchdev
  SY8106A REGULATOR DRIVER
  M:    Icenowy Zheng <icenowy@aosc.io>
  S:    Maintained
- F:    Documentation/devicetree/bindings/regulator/sy8106a-regulator.txt
+ F:    Documentation/devicetree/bindings/regulator/silergy,sy8106a.yaml
  F:    drivers/regulator/sy8106a-regulator.c
  
  SYNC FILE FRAMEWORK
@@@ -18475,7 -18741,7 +18742,7 @@@ S:   Supporte
  F:    drivers/net/ethernet/tehuti/*
  
  TELECOM CLOCK DRIVER FOR MCPL0010
- M:    Mark Gross <mark.gross@intel.com>
+ M:    Mark Gross <markgross@kernel.org>
  S:    Supported
  F:    drivers/char/tlclk.c
  
@@@ -18528,7 -18794,7 +18795,7 @@@ M:   Santosh Shilimkar <ssantosh@kernel.o
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  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/arm/keystone/ti,sci.yaml
  F:    Documentation/devicetree/bindings/clock/ti,sci-clk.yaml
  F:    Documentation/devicetree/bindings/interrupt-controller/ti,sci-inta.yaml
  F:    Documentation/devicetree/bindings/interrupt-controller/ti,sci-intr.yaml
@@@ -18570,14 -18836,17 +18837,17 @@@ T:        git git://linuxtv.org/media_tree.gi
  F:    drivers/media/radio/radio-raremono.c
  
  THERMAL
- M:    Zhang Rui <rui.zhang@intel.com>
+ M:    Rafael J. Wysocki <rafael@kernel.org>
  M:    Daniel Lezcano <daniel.lezcano@linaro.org>
  R:    Amit Kucheria <amitk@kernel.org>
+ R:    Zhang Rui <rui.zhang@intel.com>
  L:    linux-pm@vger.kernel.org
  S:    Supported
  Q:    https://patchwork.kernel.org/project/linux-pm/list/
- T:    git git://git.kernel.org/pub/scm/linux/kernel/git/thermal/linux.git
+ T:    git git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git thermal
+ F:    Documentation/ABI/testing/sysfs-class-thermal
  F:    Documentation/devicetree/bindings/thermal/
+ F:    Documentation/driver-api/thermal/
  F:    drivers/thermal/
  F:    include/linux/cpu_cooling.h
  F:    include/linux/thermal.h
@@@ -18705,7 -18974,7 +18975,7 @@@ F:   include/linux/clk/ti.
  
  TI DAVINCI MACHINE SUPPORT
  M:    Sekhar Nori <nsekhar@ti.com>
- R:    Bartosz Golaszewski <bgolaszewski@baylibre.com>
+ R:    Bartosz Golaszewski <brgl@bgdev.pl>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Supported
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci.git
@@@ -18795,7 -19064,7 +19065,7 @@@ M:   Mark Greer <mgreer@animalcreek.com
  L:    linux-wireless@vger.kernel.org
  L:    linux-nfc@lists.01.org (subscribers-only)
  S:    Supported
- F:    Documentation/devicetree/bindings/net/nfc/trf7970a.txt
+ F:    Documentation/devicetree/bindings/net/nfc/ti,trf7970a.yaml
  F:    drivers/nfc/trf7970a.c
  
  TI TSC2046 ADC DRIVER
@@@ -18990,7 -19259,7 +19260,7 @@@ TRACIN
  M:    Steven Rostedt <rostedt@goodmis.org>
  M:    Ingo Molnar <mingo@redhat.com>
  S:    Maintained
- T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git perf/core
+ T:    git git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace.git
  F:    Documentation/trace/ftrace.rst
  F:    arch/*/*/*/ftrace.h
  F:    arch/*/kernel/ftrace.c
@@@ -19304,13 -19573,12 +19574,12 @@@ S:        Maintaine
  F:    drivers/usb/misc/chaoskey.c
  
  USB CYPRESS C67X00 DRIVER
- M:    Peter Korsgaard <jacmet@sunsite.dk>
  L:    linux-usb@vger.kernel.org
- S:    Maintained
+ S:    Orphan
  F:    drivers/usb/c67x00/
  
  USB DAVICOM DM9601 DRIVER
- M:    Peter Korsgaard <jacmet@sunsite.dk>
+ M:    Peter Korsgaard <peter@korsgaard.com>
  L:    netdev@vger.kernel.org
  S:    Maintained
  W:    http://www.linux-usb.org/usbnet
@@@ -19949,7 -20217,7 +20218,7 @@@ F:   include/uapi/linux/virtio_snd.
  F:    sound/virtio/*
  
  VIRTIO I2C DRIVER
- M:    Jie Deng <jie.deng@intel.com>
+ M:    Conghui Chen <conghui.chen@intel.com>
  M:    Viresh Kumar <viresh.kumar@linaro.org>
  L:    linux-i2c@vger.kernel.org
  L:    virtualization@lists.linux-foundation.org
@@@ -19957,6 -20225,13 +20226,13 @@@ S: Maintaine
  F:    drivers/i2c/busses/i2c-virtio.c
  F:    include/uapi/linux/virtio_i2c.h
  
+ VIRTIO PMEM DRIVER
+ M:    Pankaj Gupta <pankaj.gupta.linux@gmail.com>
+ L:    virtualization@lists.linux-foundation.org
+ S:    Maintained
+ F:    drivers/nvdimm/virtio_pmem.c
+ F:    drivers/nvdimm/nd_virtio.c
  VIRTUAL BOX GUEST DEVICE DRIVER
  M:    Hans de Goede <hdegoede@redhat.com>
  M:    Arnd Bergmann <arnd@arndb.de>
@@@ -20042,7 -20317,8 +20318,8 @@@ F:   arch/x86/include/asm/vmware.
  F:    arch/x86/kernel/cpu/vmware.c
  
  VMWARE PVRDMA DRIVER
- M:    Adit Ranadive <aditr@vmware.com>
+ M:    Bryan Tan <bryantan@vmware.com>
+ M:    Vishnu Dasa <vdasa@vmware.com>
  M:    VMware PV-Drivers <pv-drivers@vmware.com>
  L:    linux-rdma@vger.kernel.org
  S:    Maintained
@@@ -20352,6 -20628,7 +20629,7 @@@ X86 ARCHITECTURE (32-BIT AND 64-BIT
  M:    Thomas Gleixner <tglx@linutronix.de>
  M:    Ingo Molnar <mingo@redhat.com>
  M:    Borislav Petkov <bp@alien8.de>
+ M:    Dave Hansen <dave.hansen@linux.intel.com>
  M:    x86@kernel.org
  R:    "H. Peter Anvin" <hpa@zytor.com>
  L:    linux-kernel@vger.kernel.org
@@@ -20373,6 -20650,8 +20651,8 @@@ M:   Tony Luck <tony.luck@intel.com
  M:    Borislav Petkov <bp@alien8.de>
  L:    linux-edac@vger.kernel.org
  S:    Maintained
+ F:    Documentation/ABI/testing/sysfs-mce
+ F:    Documentation/x86/x86_64/machinecheck.rst
  F:    arch/x86/kernel/cpu/mce/*
  
  X86 MICROCODE UPDATE SUPPORT
@@@ -20391,7 -20670,7 +20671,7 @@@ F:   arch/x86/mm
  
  X86 PLATFORM DRIVERS
  M:    Hans de Goede <hdegoede@redhat.com>
- M:    Mark Gross <mgross@linux.intel.com>
+ M:    Mark Gross <markgross@kernel.org>
  L:    platform-driver-x86@vger.kernel.org
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git
@@@ -20490,7 -20769,6 +20770,6 @@@ F:   samples/bpf/xdpsock
  F:    tools/lib/bpf/xsk*
  
  XEN BLOCK SUBSYSTEM
- M:    Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
  M:    Roger Pau Monné <roger.pau@citrix.com>
  L:    xen-devel@lists.xenproject.org (moderated for non-subscribers)
  S:    Supported
@@@ -20538,7 -20816,7 +20817,7 @@@ S:   Supporte
  F:    drivers/net/xen-netback/*
  
  XEN PCI SUBSYSTEM
- M:    Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
+ M:    Juergen Gross <jgross@suse.com>
  L:    xen-devel@lists.xenproject.org (moderated for non-subscribers)
  S:    Supported
  F:    arch/x86/pci/*xen*
@@@ -20561,7 -20839,8 +20840,8 @@@ S:   Supporte
  F:    sound/xen/*
  
  XEN SWIOTLB SUBSYSTEM
- M:    Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
+ M:    Juergen Gross <jgross@suse.com>
+ M:    Stefano Stabellini <sstabellini@kernel.org>
  L:    xen-devel@lists.xenproject.org (moderated for non-subscribers)
  L:    iommu@lists.linux-foundation.org
  S:    Supported
@@@ -20720,7 -20999,6 +21000,6 @@@ S:   Maintaine
  F:    mm/zbud.c
  
  ZD1211RW WIRELESS DRIVER
- M:    Daniel Drake <dsd@gentoo.org>
  M:    Ulrich Kunitz <kune@deine-taler.de>
  L:    linux-wireless@vger.kernel.org
  L:    zd1211-devs@lists.sourceforge.net (subscribers-only)
@@@ -20803,6 -21081,18 +21082,18 @@@ F: Documentation/vm/zsmalloc.rs
  F:    include/linux/zsmalloc.h
  F:    mm/zsmalloc.c
  
+ ZSTD
+ M:    Nick Terrell <terrelln@fb.com>
+ S:    Maintained
+ B:    https://github.com/facebook/zstd/issues
+ T:    git git://github.com/terrelln/linux.git
+ F:    include/linux/zstd*
+ F:    lib/zstd/
+ F:    lib/decompress_unzstd.c
+ F:    crypto/zstd.c
+ N:    zstd
+ K:    zstd
  ZSWAP COMPRESSED SWAP CACHING
  M:    Seth Jennings <sjenning@redhat.com>
  M:    Dan Streetman <ddstreet@ieee.org>
@@@ -7,18 -7,16 +7,23 @@@
  #include <linux/dma-buf.h>
  #include <linux/highmem.h>
  #include <linux/dma-resv.h>
+ #include <linux/module.h>
+ #include <asm/smp.h>
  
  #include "i915_drv.h"
  #include "i915_gem_object.h"
  #include "i915_scatterlist.h"
  
+ MODULE_IMPORT_NS(DMA_BUF);
 +#if defined(CONFIG_X86)
 +#include <asm/smp.h>
 +#else
 +#define wbinvd_on_all_cpus() \
 +      pr_warn(DRIVER_NAME ": Missing cache flush in %s\n", __func__)
 +#endif
 +
  I915_SELFTEST_DECLARE(static bool force_different_devices;)
  
  static struct drm_i915_gem_object *dma_buf_to_obj(struct dma_buf *buf)
@@@ -250,19 -248,8 +255,19 @@@ static int i915_gem_object_get_pages_dm
        if (IS_ERR(pages))
                return PTR_ERR(pages);
  
 -      /* XXX: consider doing a vmap flush or something */
 -      if (!HAS_LLC(i915) || i915_gem_object_can_bypass_llc(obj))
 +      /*
 +       * DG1 is special here since it still snoops transactions even with
 +       * CACHE_NONE. This is not the case with other HAS_SNOOP platforms. We
 +       * might need to revisit this as we add new discrete platforms.
 +       *
 +       * XXX: Consider doing a vmap flush or something, where possible.
 +       * Currently we just do a heavy handed wbinvd_on_all_cpus() here since
 +       * the underlying sg_table might not even point to struct pages, so we
 +       * can't just call drm_clflush_sg or similar, like we do elsewhere in
 +       * the driver.
 +       */
 +      if (i915_gem_object_can_bypass_llc(obj) ||
 +          (!HAS_LLC(i915) && !IS_DG1(i915)))
                wbinvd_on_all_cpus();
  
        sg_page_sizes = i915_sg_dma_sizes(pages->sgl);
@@@ -219,7 -219,7 +219,7 @@@ int __intel_context_do_pin_ww(struct in
         */
  
        err = i915_gem_object_lock(ce->timeline->hwsp_ggtt->obj, ww);
 -      if (!err && ce->ring->vma->obj)
 +      if (!err)
                err = i915_gem_object_lock(ce->ring->vma->obj, ww);
        if (!err && ce->state)
                err = i915_gem_object_lock(ce->state->obj, ww);
        if (err)
                return err;
  
 -      err = i915_active_acquire(&ce->active);
 +      err = ce->ops->pre_pin(ce, ww, &vaddr);
        if (err)
                goto err_ctx_unpin;
  
 -      err = ce->ops->pre_pin(ce, ww, &vaddr);
 +      err = i915_active_acquire(&ce->active);
        if (err)
 -              goto err_release;
 +              goto err_post_unpin;
  
        err = mutex_lock_interruptible(&ce->pin_mutex);
        if (err)
 -              goto err_post_unpin;
 +              goto err_release;
  
        intel_engine_pm_might_get(ce->engine);
  
  
  err_unlock:
        mutex_unlock(&ce->pin_mutex);
 +err_release:
 +      i915_active_release(&ce->active);
  err_post_unpin:
        if (!handoff)
                ce->ops->post_unpin(ce);
 -err_release:
 -      i915_active_release(&ce->active);
  err_ctx_unpin:
        intel_context_post_unpin(ce);
  
@@@ -365,7 -365,8 +365,8 @@@ static int __intel_context_active(struc
  }
  
  static int __i915_sw_fence_call
- sw_fence_dummy_notify(struct i915_sw_fence *sf, enum i915_sw_fence_notify state)
+ sw_fence_dummy_notify(struct i915_sw_fence *sf,
+                     enum i915_sw_fence_notify state)
  {
        return NOTIFY_DONE;
  }
@@@ -498,18 -498,6 +498,18 @@@ static inline bool i915_mmio_reg_valid(
  #define   ECOBITS_PPGTT_CACHE64B      (3 << 8)
  #define   ECOBITS_PPGTT_CACHE4B               (0 << 8)
  
 +#define GEN12_GAMCNTRL_CTRL                   _MMIO(0xcf54)
 +#define   INVALIDATION_BROADCAST_MODE_DIS     REG_BIT(12)
 +#define   GLOBAL_INVALIDATION_MODE            REG_BIT(2)
 +
 +#define GEN12_GAMSTLB_CTRL            _MMIO(0xcf4c)
 +#define   CONTROL_BLOCK_CLKGATE_DIS   REG_BIT(12)
 +#define   EGRESS_BLOCK_CLKGATE_DIS    REG_BIT(11)
 +#define   TAG_BLOCK_CLKGATE_DIS               REG_BIT(7)
 +
 +#define GEN12_MERT_MOD_CTRL           _MMIO(0xcf28)
 +#define   FORCE_MISS_FTLB             REG_BIT(3)
 +
  #define GAB_CTL                               _MMIO(0x24000)
  #define   GAB_CTL_CONT_AFTER_PAGEFAULT        (1 << 8)
  
  
  #define GEN12_OA_TLB_INV_CR _MMIO(0xceec)
  
 +#define GEN12_SQCM            _MMIO(0x8724)
 +#define   EN_32B_ACCESS               REG_BIT(30)
 +
  /* Gen12 OAR unit */
  #define GEN12_OAR_OACONTROL _MMIO(0x2960)
  #define  GEN12_OAR_OACONTROL_COUNTER_FORMAT_SHIFT 1
  #define EU_PERF_CNTL5     _MMIO(0xe55c)
  #define EU_PERF_CNTL6     _MMIO(0xe65c)
  
 +#define RT_CTRL                       _MMIO(0xe530)
 +#define  DIS_NULL_QUERY               REG_BIT(10)
 +
  /*
   * OA Boolean state
   */
  #define   RING_WAIT           (1 << 11) /* gen3+, PRBx_CTL */
  #define   RING_WAIT_SEMAPHORE (1 << 10) /* gen6+ */
  
 +#define GUCPMTIMESTAMP          _MMIO(0xC3E8)
 +
  /* There are 16 64-bit CS General Purpose Registers per-engine on Gen8+ */
  #define GEN8_RING_CS_GPR(base, n)     _MMIO((base) + 0x600 + (n) * 8)
  #define GEN8_RING_CS_GPR_UDW(base, n) _MMIO((base) + 0x600 + (n) * 8 + 4)
  #define VDBOX_CGCTL3F10(base)         _MMIO((base) + 0x3f10)
  #define   IECPUNIT_CLKGATE_DIS                REG_BIT(22)
  
 +#define VDBOX_CGCTL3F18(base)         _MMIO((base) + 0x3f18)
 +#define   ALNUNIT_CLKGATE_DIS         REG_BIT(13)
 +
  #define ERROR_GEN6    _MMIO(0x40a0)
  #define GEN7_ERR_INT  _MMIO(0x44040)
  #define   ERR_INT_POISON              (1 << 31)
  #define   GEN9_PREEMPT_GPGPU_SYNC_SWITCH_DISABLE (1 << 2)
  #define   GEN11_ENABLE_32_PLANE_MODE (1 << 7)
  
 +#define SCCGCTL94DC           _MMIO(0x94dc)
 +#define   CG3DDISURB          REG_BIT(14)
 +
 +#define MLTICTXCTL            _MMIO(0xb170)
 +#define   TDONRENDER          REG_BIT(2)
 +
 +#define L3SQCREG1_CCS0                _MMIO(0xb200)
 +#define   FLUSHALLNONCOH      REG_BIT(5)
 +
  /* WaClearTdlStateAckDirtyBits */
  #define GEN8_STATE_ACK                _MMIO(0x20F0)
  #define GEN9_STATE_ACK_SLICE1 _MMIO(0x20F8)
  #define GEN9_RCS_FE_FSM2 _MMIO(0x22a4)
  
  #define GEN10_CACHE_MODE_SS                   _MMIO(0xe420)
 -#define   FLOAT_BLEND_OPTIMIZATION_ENABLE     (1 << 4)
 +#define   ENABLE_PREFETCH_INTO_IC             REG_BIT(3)
 +#define   FLOAT_BLEND_OPTIMIZATION_ENABLE     REG_BIT(4)
  
  /* Fuse readout registers for GT */
  #define HSW_PAVP_FUSE1                        _MMIO(0x911C)
@@@ -4311,62 -4278,21 +4311,62 @@@ enum 
  /*
   * GEN10 clock gating regs
   */
 +
 +#define UNSLCGCTL9440                 _MMIO(0x9440)
 +#define   GAMTLBOACS_CLKGATE_DIS      REG_BIT(28)
 +#define   GAMTLBVDBOX5_CLKGATE_DIS    REG_BIT(27)
 +#define   GAMTLBVDBOX6_CLKGATE_DIS    REG_BIT(26)
 +#define   GAMTLBVDBOX3_CLKGATE_DIS    REG_BIT(24)
 +#define   GAMTLBVDBOX4_CLKGATE_DIS    REG_BIT(23)
 +#define   GAMTLBVDBOX7_CLKGATE_DIS    REG_BIT(22)
 +#define   GAMTLBVDBOX2_CLKGATE_DIS    REG_BIT(21)
 +#define   GAMTLBVDBOX0_CLKGATE_DIS    REG_BIT(17)
 +#define   GAMTLBKCR_CLKGATE_DIS               REG_BIT(16)
 +#define   GAMTLBGUC_CLKGATE_DIS               REG_BIT(15)
 +#define   GAMTLBBLT_CLKGATE_DIS               REG_BIT(14)
 +#define   GAMTLBVDBOX1_CLKGATE_DIS    REG_BIT(6)
 +
 +#define UNSLCGCTL9444                 _MMIO(0x9444)
 +#define   GAMTLBGFXA0_CLKGATE_DIS     REG_BIT(30)
 +#define   GAMTLBGFXA1_CLKGATE_DIS     REG_BIT(29)
 +#define   GAMTLBCOMPA0_CLKGATE_DIS    REG_BIT(28)
 +#define   GAMTLBCOMPA1_CLKGATE_DIS    REG_BIT(27)
 +#define   GAMTLBCOMPB0_CLKGATE_DIS    REG_BIT(26)
 +#define   GAMTLBCOMPB1_CLKGATE_DIS    REG_BIT(25)
 +#define   GAMTLBCOMPC0_CLKGATE_DIS    REG_BIT(24)
 +#define   GAMTLBCOMPC1_CLKGATE_DIS    REG_BIT(23)
 +#define   GAMTLBCOMPD0_CLKGATE_DIS    REG_BIT(22)
 +#define   GAMTLBCOMPD1_CLKGATE_DIS    REG_BIT(21)
 +#define   GAMTLBMERT_CLKGATE_DIS      REG_BIT(20)
 +#define   GAMTLBVEBOX3_CLKGATE_DIS    REG_BIT(19)
 +#define   GAMTLBVEBOX2_CLKGATE_DIS    REG_BIT(18)
 +#define   GAMTLBVEBOX1_CLKGATE_DIS    REG_BIT(17)
 +#define   GAMTLBVEBOX0_CLKGATE_DIS    REG_BIT(16)
 +#define   LTCDD_CLKGATE_DIS           REG_BIT(10)
 +
  #define SLICE_UNIT_LEVEL_CLKGATE      _MMIO(0x94d4)
  #define  SARBUNIT_CLKGATE_DIS         (1 << 5)
  #define  RCCUNIT_CLKGATE_DIS          (1 << 7)
  #define  MSCUNIT_CLKGATE_DIS          (1 << 10)
 +#define  NODEDSS_CLKGATE_DIS          REG_BIT(12)
  #define  L3_CLKGATE_DIS                       REG_BIT(16)
  #define  L3_CR2X_CLKGATE_DIS          REG_BIT(17)
  
  #define SUBSLICE_UNIT_LEVEL_CLKGATE   _MMIO(0x9524)
 -#define  GWUNIT_CLKGATE_DIS           (1 << 16)
 +#define   DSS_ROUTER_CLKGATE_DIS      REG_BIT(28)
 +#define   GWUNIT_CLKGATE_DIS          REG_BIT(16)
  
  #define SUBSLICE_UNIT_LEVEL_CLKGATE2  _MMIO(0x9528)
  #define  CPSSUNIT_CLKGATE_DIS         REG_BIT(9)
  
 +#define SSMCGCTL9530                  _MMIO(0x9530)
 +#define   RTFUNIT_CLKGATE_DIS         REG_BIT(18)
 +
  #define UNSLICE_UNIT_LEVEL_CLKGATE    _MMIO(0x9434)
  #define   VFUNIT_CLKGATE_DIS          REG_BIT(20)
 +#define   TSGUNIT_CLKGATE_DIS         REG_BIT(17) /* XEHPSDV */
 +#define   CG3DDISCFEG_CLKGATE_DIS     REG_BIT(17) /* DG2 */
 +#define   GAMEDIA_CLKGATE_DIS         REG_BIT(11)
  #define   HSUNIT_CLKGATE_DIS          REG_BIT(8)
  #define   VSUNIT_CLKGATE_DIS          REG_BIT(3)
  
  #define GEN9_CTX_PREEMPT_REG          _MMIO(0x2248)
  #define   GEN12_DISABLE_POSH_BUSY_FF_DOP_CG REG_BIT(11)
  
 +#define GEN12_CS_DEBUG_MODE1_CCCSUNIT_BE_COMMON               _MMIO(0x20EC)
 +#define   GEN12_REPLAY_MODE_GRANULARITY                       REG_BIT(0)
 +
  #define GEN8_CS_CHICKEN1              _MMIO(0x2580)
  #define GEN9_PREEMPT_3D_OBJECT_LEVEL          (1 << 0)
  #define GEN9_PREEMPT_GPGPU_LEVEL(hi, lo)      (((hi) << 2) | ((lo) << 1))
    #define GEN8_ERRDETBCTRL (1 << 9)
  
  #define GEN11_COMMON_SLICE_CHICKEN3                   _MMIO(0x7304)
 -  #define DG1_FLOAT_POINT_BLEND_OPT_STRICT_MODE_EN    REG_BIT(12)
 -  #define GEN11_BLEND_EMB_FIX_DISABLE_IN_RCC          REG_BIT(11)
 -  #define GEN12_DISABLE_CPS_AWARE_COLOR_PIPE          REG_BIT(9)
 +#define   DG1_FLOAT_POINT_BLEND_OPT_STRICT_MODE_EN    REG_BIT(12)
 +#define   XEHP_DUAL_SIMD8_SEQ_MERGE_DISABLE           REG_BIT(12)
 +#define   GEN11_BLEND_EMB_FIX_DISABLE_IN_RCC          REG_BIT(11)
 +#define   GEN12_DISABLE_CPS_AWARE_COLOR_PIPE          REG_BIT(9)
  
  #define HIZ_CHICKEN                                   _MMIO(0x7018)
  # define CHV_HZ_8X8_MODE_IN_1X                                REG_BIT(15)
  #define  GEN8_LQSC_FLUSH_COHERENT_LINES               (1 << 21)
  #define  GEN8_LQSQ_NONIA_COHERENT_ATOMICS_ENABLE REG_BIT(22)
  
 +#define GEN11_L3SQCREG5                               _MMIO(0xb158)
 +#define   L3_PWM_TIMER_INIT_VAL_MASK          REG_GENMASK(9, 0)
 +
 +#define XEHP_L3SCQREG7                                _MMIO(0xb188)
 +#define   BLEND_FILL_CACHING_OPT_DIS          REG_BIT(3)
 +
  /* GEN8 chicken */
  #define HDC_CHICKEN0                          _MMIO(0x7300)
  #define ICL_HDC_MODE                          _MMIO(0xE5F4)
  #define  HDC_FORCE_NON_COHERENT                       (1 << 4)
  #define  HDC_BARRIER_PERFORMANCE_DISABLE      (1 << 10)
  
 +#define GEN12_HDC_CHICKEN0                                    _MMIO(0xE5F0)
 +#define   LSC_L1_FLUSH_CTL_3D_DATAPORT_FLUSH_EVENTS_MASK      REG_GENMASK(13, 11)
 +
 +#define SARB_CHICKEN1                         _MMIO(0xe90c)
 +#define   COMP_CKN_IN                         REG_GENMASK(30, 29)
 +
  #define GEN8_HDC_CHICKEN1                     _MMIO(0x7304)
  
  /* GEN9 chicken */
  #define   PIXEL_ROUNDING_TRUNC_FB_PASSTHRU    (1 << 15)
  #define   PER_PIXEL_ALPHA_BYPASS_EN           (1 << 7)
  
 +#define VFLSKPD                               _MMIO(0x62a8)
 +#define   DIS_OVER_FETCH_CACHE                REG_BIT(1)
 +#define   DIS_MULT_MISS_RD_SQUASH     REG_BIT(0)
 +
  #define FF_MODE2                      _MMIO(0x6604)
  #define   FF_MODE2_GS_TIMER_MASK      REG_GENMASK(31, 24)
  #define   FF_MODE2_GS_TIMER_224               REG_FIELD_PREP(FF_MODE2_GS_TIMER_MASK, 224)
  #define   GEN8_SDEUNIT_CLOCK_GATE_DISABLE     (1 << 14)
  #define   GEN8_HDCUNIT_CLOCK_GATE_DISABLE_HDCREQ (1 << 28)
  
 +#define UNSLCGCTL9430                         _MMIO(0x9430)
 +#define   MSQDUNIT_CLKGATE_DIS                        REG_BIT(3)
 +
  #define GEN6_GFXPAUSE                         _MMIO(0xA000)
  #define GEN6_RPNSWREQ                         _MMIO(0xA008)
  #define   GEN6_TURBO_DISABLE                  (1 << 31)
  #define   GEN9_CCS_TLB_PREFETCH_ENABLE        (1 << 3)
  
  #define GEN8_ROW_CHICKEN              _MMIO(0xe4f0)
 -#define   FLOW_CONTROL_ENABLE         (1 << 15)
 -#define   PARTIAL_INSTRUCTION_SHOOTDOWN_DISABLE       (1 << 8)
 -#define   STALL_DOP_GATING_DISABLE            (1 << 5)
 -#define   THROTTLE_12_5                               (7 << 2)
 -#define   DISABLE_EARLY_EOT                   (1 << 1)
 +#define   FLOW_CONTROL_ENABLE                 REG_BIT(15)
 +#define   UGM_BACKUP_MODE                     REG_BIT(13)
 +#define   MDQ_ARBITRATION_MODE                        REG_BIT(12)
 +#define   PARTIAL_INSTRUCTION_SHOOTDOWN_DISABLE       REG_BIT(8)
 +#define   STALL_DOP_GATING_DISABLE            REG_BIT(5)
 +#define   THROTTLE_12_5                               REG_GENMASK(4, 2)
 +#define   DISABLE_EARLY_EOT                   REG_BIT(1)
  
  #define GEN7_ROW_CHICKEN2                     _MMIO(0xe4f4)
 +#define   GEN12_DISABLE_READ_SUPPRESSION      REG_BIT(15)
  #define   GEN12_DISABLE_EARLY_READ            REG_BIT(14)
 +#define   GEN12_ENABLE_LARGE_GRF_MODE         REG_BIT(12)
  #define   GEN12_PUSH_CONST_DEREF_HOLD_DIS     REG_BIT(8)
  
 +#define LSC_CHICKEN_BIT_0                     _MMIO(0xe7c8)
 +#define   FORCE_1_SUB_MESSAGE_PER_FRAGMENT    REG_BIT(15)
 +#define LSC_CHICKEN_BIT_0_UDW                 _MMIO(0xe7c8 + 4)
 +#define   DIS_CHAIN_2XSIMD8                   REG_BIT(55 - 32)
 +#define   FORCE_SLM_FENCE_SCOPE_TO_TILE               REG_BIT(42 - 32)
 +#define   FORCE_UGM_FENCE_SCOPE_TO_TILE               REG_BIT(41 - 32)
 +#define   MAXREQS_PER_BANK                    REG_GENMASK(39 - 32, 37 - 32)
 +#define   DISABLE_128B_EVICTION_COMMAND_UDW   REG_BIT(36 - 32)
 +
  #define GEN7_ROW_CHICKEN2_GT2         _MMIO(0xf4f4)
  #define   DOP_CLOCK_GATING_DISABLE    (1 << 0)
  #define   PUSH_CONSTANT_DEREF_DISABLE (1 << 8)
  #define   GEN11_TDL_CLOCK_GATING_FIX_DISABLE  (1 << 1)
  
 -#define GEN9_ROW_CHICKEN4             _MMIO(0xe48c)
 -#define   GEN12_DISABLE_TDL_PUSH      REG_BIT(9)
 -#define   GEN11_DIS_PICK_2ND_EU               REG_BIT(7)
 +#define GEN9_ROW_CHICKEN4                             _MMIO(0xe48c)
 +#define   GEN12_DISABLE_GRF_CLEAR                     REG_BIT(13)
 +#define   GEN12_DISABLE_TDL_PUSH                      REG_BIT(9)
 +#define   GEN11_DIS_PICK_2ND_EU                               REG_BIT(7)
 +#define   GEN12_DISABLE_HDR_PAST_PAYLOAD_HOLD_FIX     REG_BIT(4)
  
  #define HSW_ROW_CHICKEN3              _MMIO(0xe49c)
  #define  HSW_ROW_CHICKEN3_L3_GLOBAL_ATOMICS_DISABLE    (1 << 6)
  #define   GEN8_SAMPLER_POWER_BYPASS_DIS       (1 << 1)
  
  #define GEN9_HALF_SLICE_CHICKEN7      _MMIO(0xe194)
 -#define   GEN9_SAMPLER_HASH_COMPRESSED_READ_ADDR      (1 << 8)
 -#define   GEN9_ENABLE_YV12_BUGFIX     (1 << 4)
 -#define   GEN9_ENABLE_GPGPU_PREEMPTION        (1 << 2)
 +#define   DG2_DISABLE_ROUND_ENABLE_ALLOW_FOR_SSLA     REG_BIT(15)
 +#define   GEN9_SAMPLER_HASH_COMPRESSED_READ_ADDR      REG_BIT(8)
 +#define   GEN9_ENABLE_YV12_BUGFIX                     REG_BIT(4)
 +#define   GEN9_ENABLE_GPGPU_PREEMPTION                        REG_BIT(2)
  
  /* Audio */
  #define G4X_AUD_VID_DID                       _MMIO(DISPLAY_MMIO_BASE(dev_priv) + 0x62020)
@@@ -11830,7 -11717,9 +11830,9 @@@ enum skl_power_gate 
  #define TGL_DSI_CHKN_REG(port)                _MMIO_PORT(port,        \
                                                    _TGL_DSI_CHKN_REG_0, \
                                                    _TGL_DSI_CHKN_REG_1)
- #define TGL_DSI_CHKN_LSHS_GB                  REG_GENMASK(15, 12)
+ #define TGL_DSI_CHKN_LSHS_GB_MASK             REG_GENMASK(15, 12)
+ #define TGL_DSI_CHKN_LSHS_GB(byte_clocks)     REG_FIELD_PREP(TGL_DSI_CHKN_LSHS_GB_MASK, \
+                                                              (byte_clocks))
  
  /* Display Stream Splitter Control */
  #define DSS_CTL1                              _MMIO(0x67400)
  #define   PMFLUSH_GAPL3UNBLOCK                (1 << 21)
  #define   PMFLUSHDONE_LNEBLK          (1 << 22)
  
 +#define XEHP_L3NODEARBCFG             _MMIO(0xb0b4)
 +#define   XEHP_LNESPARE                       REG_BIT(19)
 +
  #define GEN12_GLOBAL_MOCS(i)  _MMIO(0x4000 + (i) * 4) /* Global MOCS regs */
  
  #define GEN12_GSMBASE                 _MMIO(0x108100)
  #define GEN12_DSMBASE                 _MMIO(0x1080C0)
  
 +#define XEHP_CLOCK_GATE_DIS           _MMIO(0x101014)
 +#define   SGSI_SIDECLK_DIS            REG_BIT(17)
 +#define   SGGI_DIS                    REG_BIT(15)
 +#define   SGR_DIS                     REG_BIT(13)
 +
  /* gamt regs */
  #define GEN8_L3_LRA_1_GPGPU _MMIO(0x4dd4)
  #define   GEN8_L3_LRA_1_GPGPU_DEFAULT_VALUE_BDW  0x67F1427F /* max/min for LRA1/2 */
  #define CLKGATE_DIS_MISC                      _MMIO(0x46534)
  #define  CLKGATE_DIS_MISC_DMASC_GATING_DIS    REG_BIT(21)
  
 +#define SLICE_COMMON_ECO_CHICKEN1             _MMIO(0x731C)
 +#define   MSC_MSAA_REODER_BUF_BYPASS_DISABLE  REG_BIT(14)
 +
  #endif /* _I915_REG_H_ */
@@@ -339,7 -339,7 +339,7 @@@ bool i915_request_retire(struct i915_re
        }
  
        if (test_and_set_bit(I915_FENCE_FLAG_BOOST, &rq->fence.flags))
 -              atomic_dec(&rq->engine->gt->rps.num_waiters);
 +              intel_rps_dec_waiters(&rq->engine->gt->rps);
  
        /*
         * We only loosely track inflight requests across preemption,
@@@ -1537,38 -1537,14 +1537,14 @@@ i915_request_await_object(struct i915_r
                          struct drm_i915_gem_object *obj,
                          bool write)
  {
-       struct dma_fence *excl;
+       struct dma_resv_iter cursor;
+       struct dma_fence *fence;
        int ret = 0;
  
-       if (write) {
-               struct dma_fence **shared;
-               unsigned int count, i;
-               ret = dma_resv_get_fences(obj->base.resv, &excl, &count,
-                                         &shared);
+       dma_resv_for_each_fence(&cursor, obj->base.resv, write, fence) {
+               ret = i915_request_await_dma_fence(to, fence);
                if (ret)
-                       return ret;
-               for (i = 0; i < count; i++) {
-                       ret = i915_request_await_dma_fence(to, shared[i]);
-                       if (ret)
-                               break;
-                       dma_fence_put(shared[i]);
-               }
-               for (; i < count; i++)
-                       dma_fence_put(shared[i]);
-               kfree(shared);
-       } else {
-               excl = dma_resv_get_excl_unlocked(obj->base.resv);
-       }
-       if (excl) {
-               if (ret == 0)
-                       ret = i915_request_await_dma_fence(to, excl);
-               dma_fence_put(excl);
+                       break;
        }
  
        return ret;
  
  static struct kmem_cache *slab_vmas;
  
 -struct i915_vma *i915_vma_alloc(void)
 +static struct i915_vma *i915_vma_alloc(void)
  {
        return kmem_cache_zalloc(slab_vmas, GFP_KERNEL);
  }
  
 -void i915_vma_free(struct i915_vma *vma)
 +static void i915_vma_free(struct i915_vma *vma)
  {
        return kmem_cache_free(slab_vmas, vma);
  }
@@@ -56,8 -56,6 +56,6 @@@
  
  static void vma_print_allocator(struct i915_vma *vma, const char *reason)
  {
-       unsigned long *entries;
-       unsigned int nr_entries;
        char buf[512];
  
        if (!vma->node.stack) {
@@@ -66,8 -64,7 +64,7 @@@
                return;
        }
  
-       nr_entries = stack_depot_fetch(vma->node.stack, &entries);
-       stack_trace_snprint(buf, sizeof(buf), entries, nr_entries, 0);
+       stack_depot_snprint(vma->node.stack, buf, sizeof(buf), 0);
        DRM_DEBUG_DRIVER("vma.node [%08llx + %08llx] %s: inserted at %s\n",
                         vma->node.start, vma->node.size, reason, buf);
  }
@@@ -116,6 -113,7 +113,6 @@@ vma_create(struct drm_i915_gem_object *
        vma->vm = i915_vm_get(vm);
        vma->ops = &vm->vma_ops;
        vma->obj = obj;
 -      vma->resv = obj->base.resv;
        vma->size = obj->base.size;
        vma->display_alignment = I915_GTT_MIN_ALIGNMENT;
  
@@@ -348,7 -346,7 +345,7 @@@ int i915_vma_wait_for_bind(struct i915_
                fence = dma_fence_get_rcu_safe(&vma->active.excl.fence);
                rcu_read_unlock();
                if (fence) {
 -                      err = dma_fence_wait(fence, MAX_SCHEDULE_TIMEOUT);
 +                      err = dma_fence_wait(fence, true);
                        dma_fence_put(fence);
                }
        }
@@@ -425,8 -423,10 +422,8 @@@ int i915_vma_bind(struct i915_vma *vma
  
                work->base.dma.error = 0; /* enable the queue_work() */
  
 -              if (vma->obj) {
 -                      __i915_gem_object_pin_pages(vma->obj);
 -                      work->pinned = i915_gem_object_get(vma->obj);
 -              }
 +              __i915_gem_object_pin_pages(vma->obj);
 +              work->pinned = i915_gem_object_get(vma->obj);
        } else {
                vma->ops->bind_vma(vma->vm, NULL, vma, cache_level, bind_flags);
        }
@@@ -667,7 -667,7 +664,7 @@@ i915_vma_insert(struct i915_vma *vma, u
        }
  
        color = 0;
 -      if (vma->obj && i915_vm_has_cache_coloring(vma->vm))
 +      if (i915_vm_has_cache_coloring(vma->vm))
                color = vma->obj->cache_level;
  
        if (flags & PIN_OFFSET_FIXED) {
@@@ -792,14 -792,17 +789,14 @@@ unpinned
  static int vma_get_pages(struct i915_vma *vma)
  {
        int err = 0;
 -      bool pinned_pages = false;
 +      bool pinned_pages = true;
  
        if (atomic_add_unless(&vma->pages_count, 1, 0))
                return 0;
  
 -      if (vma->obj) {
 -              err = i915_gem_object_pin_pages(vma->obj);
 -              if (err)
 -                      return err;
 -              pinned_pages = true;
 -      }
 +      err = i915_gem_object_pin_pages(vma->obj);
 +      if (err)
 +              return err;
  
        /* Allocations ahoy! */
        if (mutex_lock_interruptible(&vma->pages_mutex)) {
@@@ -832,8 -835,8 +829,8 @@@ static void __vma_put_pages(struct i915
        if (atomic_sub_return(count, &vma->pages_count) == 0) {
                vma->ops->clear_pages(vma);
                GEM_BUG_ON(vma->pages);
 -              if (vma->obj)
 -                      i915_gem_object_unpin_pages(vma->obj);
 +
 +              i915_gem_object_unpin_pages(vma->obj);
        }
        mutex_unlock(&vma->pages_mutex);
  }
@@@ -869,7 -872,7 +866,7 @@@ int i915_vma_pin_ww(struct i915_vma *vm
        int err;
  
  #ifdef CONFIG_PROVE_LOCKING
 -      if (debug_locks && !WARN_ON(!ww) && vma->resv)
 +      if (debug_locks && !WARN_ON(!ww))
                assert_vma_held(vma);
  #endif
  
  
        GEM_BUG_ON(!vma->pages);
        err = i915_vma_bind(vma,
 -                          vma->obj ? vma->obj->cache_level : 0,
 +                          vma->obj->cache_level,
                            flags, work);
        if (err)
                goto err_remove;
@@@ -1031,7 -1034,7 +1028,7 @@@ int i915_ggtt_pin(struct i915_vma *vma
        GEM_BUG_ON(!i915_vma_is_ggtt(vma));
  
  #ifdef CONFIG_LOCKDEP
 -      WARN_ON(!ww && vma->resv && dma_resv_held(vma->resv));
 +      WARN_ON(!ww && dma_resv_held(vma->obj->base.resv));
  #endif
  
        do {
@@@ -1110,7 -1113,6 +1107,7 @@@ void i915_vma_reopen(struct i915_vma *v
  void i915_vma_release(struct kref *ref)
  {
        struct i915_vma *vma = container_of(ref, typeof(*vma), ref);
 +      struct drm_i915_gem_object *obj = vma->obj;
  
        if (drm_mm_node_allocated(&vma->node)) {
                mutex_lock(&vma->vm->mutex);
        }
        GEM_BUG_ON(i915_vma_is_active(vma));
  
 -      if (vma->obj) {
 -              struct drm_i915_gem_object *obj = vma->obj;
 -
 -              spin_lock(&obj->vma.lock);
 -              list_del(&vma->obj_link);
 -              if (!RB_EMPTY_NODE(&vma->obj_node))
 -                      rb_erase(&vma->obj_node, &obj->vma.tree);
 -              spin_unlock(&obj->vma.lock);
 -      }
 +      spin_lock(&obj->vma.lock);
 +      list_del(&vma->obj_link);
 +      if (!RB_EMPTY_NODE(&vma->obj_node))
 +              rb_erase(&vma->obj_node, &obj->vma.tree);
 +      spin_unlock(&obj->vma.lock);
  
        __i915_vma_remove_closed(vma);
        i915_vm_put(vma->vm);
@@@ -1250,19 -1256,19 +1247,19 @@@ int _i915_vma_move_to_active(struct i91
                }
  
                if (fence) {
 -                      dma_resv_add_excl_fence(vma->resv, fence);
 +                      dma_resv_add_excl_fence(vma->obj->base.resv, fence);
                        obj->write_domain = I915_GEM_DOMAIN_RENDER;
                        obj->read_domains = 0;
                }
        } else {
                if (!(flags & __EXEC_OBJECT_NO_RESERVE)) {
 -                      err = dma_resv_reserve_shared(vma->resv, 1);
 +                      err = dma_resv_reserve_shared(vma->obj->base.resv, 1);
                        if (unlikely(err))
                                return err;
                }
  
                if (fence) {
 -                      dma_resv_add_shared_fence(vma->resv, fence);
 +                      dma_resv_add_shared_fence(vma->obj->base.resv, fence);
                        obj->write_domain = 0;
                }
        }
@@@ -77,6 -77,8 +77,8 @@@ struct intel_wm_config 
  
  static void gen9_init_clock_gating(struct drm_i915_private *dev_priv)
  {
+       enum pipe pipe;
        if (HAS_LLC(dev_priv)) {
                /*
                 * WaCompressedResourceDisplayNewHashMode:skl,kbl
                           SKL_DE_COMPRESSED_HASH_MODE);
        }
  
+       for_each_pipe(dev_priv, pipe) {
+               /*
+                * "Plane N strech max must be programmed to 11b (x1)
+                *  when Async flips are enabled on that plane."
+                */
+               if (!IS_GEMINILAKE(dev_priv) && intel_vtd_active())
+                       intel_uncore_rmw(&dev_priv->uncore, CHICKEN_PIPESL_1(pipe),
+                                        SKL_PLANE1_STRETCH_MAX_MASK, SKL_PLANE1_STRETCH_MAX_X1);
+       }
        /* See Bspec note for PSR2_CTL bit 31, Wa#828:skl,bxt,kbl,cfl */
        intel_uncore_write(&dev_priv->uncore, CHICKEN_PAR1_1,
                   intel_uncore_read(&dev_priv->uncore, CHICKEN_PAR1_1) | SKL_EDP_PSR_FIX_RDWRAP);
@@@ -7461,34 -7473,11 +7473,34 @@@ static void dg1_init_clock_gating(struc
        gen12lp_init_clock_gating(dev_priv);
  
        /* Wa_1409836686:dg1[a0] */
 -      if (IS_DG1_GT_STEP(dev_priv, STEP_A0, STEP_B0))
 +      if (IS_DG1_GRAPHICS_STEP(dev_priv, STEP_A0, STEP_B0))
                intel_uncore_write(&dev_priv->uncore, GEN9_CLKGATE_DIS_3, intel_uncore_read(&dev_priv->uncore, GEN9_CLKGATE_DIS_3) |
                           DPT_GATING_DIS);
  }
  
 +static void xehpsdv_init_clock_gating(struct drm_i915_private *dev_priv)
 +{
 +      /* Wa_22010146351:xehpsdv */
 +      if (IS_XEHPSDV_GRAPHICS_STEP(dev_priv, STEP_A0, STEP_B0))
 +              intel_uncore_rmw(&dev_priv->uncore, XEHP_CLOCK_GATE_DIS, 0, SGR_DIS);
 +}
 +
 +static void dg2_init_clock_gating(struct drm_i915_private *i915)
 +{
 +      /* Wa_22010954014:dg2_g10 */
 +      if (IS_DG2_G10(i915))
 +              intel_uncore_rmw(&i915->uncore, XEHP_CLOCK_GATE_DIS, 0,
 +                               SGSI_SIDECLK_DIS);
 +
 +      /*
 +       * Wa_14010733611:dg2_g10
 +       * Wa_22010146351:dg2_g10
 +       */
 +      if (IS_DG2_GRAPHICS_STEP(i915, G10, STEP_A0, STEP_B0))
 +              intel_uncore_rmw(&i915->uncore, XEHP_CLOCK_GATE_DIS, 0,
 +                               SGR_DIS | SGGI_DIS);
 +}
 +
  static void cnp_init_clock_gating(struct drm_i915_private *dev_priv)
  {
        if (!HAS_PCH_CNP(dev_priv))
@@@ -7532,12 -7521,12 +7544,12 @@@ static void kbl_init_clock_gating(struc
                   FBC_LLC_FULLY_OPEN);
  
        /* WaDisableSDEUnitClockGating:kbl */
 -      if (IS_KBL_GT_STEP(dev_priv, 0, STEP_C0))
 +      if (IS_KBL_GRAPHICS_STEP(dev_priv, 0, STEP_C0))
                intel_uncore_write(&dev_priv->uncore, GEN8_UCGCTL6, intel_uncore_read(&dev_priv->uncore, GEN8_UCGCTL6) |
                           GEN8_SDEUNIT_CLOCK_GATE_DISABLE);
  
        /* WaDisableGamClockGating:kbl */
 -      if (IS_KBL_GT_STEP(dev_priv, 0, STEP_C0))
 +      if (IS_KBL_GRAPHICS_STEP(dev_priv, 0, STEP_C0))
                intel_uncore_write(&dev_priv->uncore, GEN6_UCGCTL1, intel_uncore_read(&dev_priv->uncore, GEN6_UCGCTL1) |
                           GEN6_GAMUNIT_CLOCK_GATE_DISABLE);
  
@@@ -7899,8 -7888,6 +7911,8 @@@ static const struct drm_i915_clock_gati
        .init_clock_gating = platform##_init_clock_gating,              \
  }
  
 +CG_FUNCS(dg2);
 +CG_FUNCS(xehpsdv);
  CG_FUNCS(adlp);
  CG_FUNCS(dg1);
  CG_FUNCS(gen12lp);
@@@ -7937,11 -7924,7 +7949,11 @@@ CG_FUNCS(nop)
   */
  void intel_init_clock_gating_hooks(struct drm_i915_private *dev_priv)
  {
 -      if (IS_ALDERLAKE_P(dev_priv))
 +      if (IS_DG2(dev_priv))
 +              dev_priv->clock_gating_funcs = &dg2_clock_gating_funcs;
 +      else if (IS_XEHPSDV(dev_priv))
 +              dev_priv->clock_gating_funcs = &xehpsdv_clock_gating_funcs;
 +      else if (IS_ALDERLAKE_P(dev_priv))
                dev_priv->clock_gating_funcs = &adlp_clock_gating_funcs;
        else if (IS_DG1(dev_priv))
                dev_priv->clock_gating_funcs = &dg1_clock_gating_funcs;