Merge tag 'drm-next-2023-11-07' of git://anongit.freedesktop.org/drm/drm
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 8 Nov 2023 01:10:02 +0000 (17:10 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 8 Nov 2023 01:10:02 +0000 (17:10 -0800)
Pull more drm updates from Dave Airlie:
 "Geert pointed out I missed the renesas reworks in my main pull, so
  this pull contains the renesas next work for atomic conversion and DT
  support.

  It also contains a bunch of amdgpu and some small ssd13xx fixes.

  renesas:
   - atomic conversion
   - DT support

  ssd13xx:
   - dt binding fix for ssd132x
   - Initialize ssd130x crtc_state to NULL.

  amdgpu:
   - Fix RAS support check
   - RAS fixes
   - MES fixes
   - SMU13 fixes
   - Contiguous memory allocation fix
   - BACO fixes
   - GPU reset fixes
   - Min power limit fixes
   - GFX11 fixes
   - USB4/TB hotplug fixes
   - ARM regression fix
   - GFX9.4.3 fixes
   - KASAN/KCSAN stack size check fixes
   - SR-IOV fixes
   - SMU14 fixes
   - PSP13 fixes
   - Display blend fixes
   - Flexible array size fixes

  amdkfd:
   - GPUVM fix

  radeon:
   - Flexible array size fixes"

* tag 'drm-next-2023-11-07' of git://anongit.freedesktop.org/drm/drm: (83 commits)
  drm/amd/display: Enable fast update on blendTF change
  drm/amd/display: Fix blend LUT programming
  drm/amd/display: Program plane color setting correctly
  drm/amdgpu: Query and report boot status
  drm/amdgpu: Add psp v13 function to query boot status
  drm/amd/swsmu: remove fw version check in sw_init.
  drm/amd/swsmu: update smu v14_0_0 driver if and metrics table
  drm/amdgpu: Add C2PMSG_109/126 reg field shift/masks
  drm/amdgpu: Optimize the asic type fix code
  drm/amdgpu: fix GRBM read timeout when do mes_self_test
  drm/amdgpu: check recovery status of xgmi hive in ras_reset_error_count
  drm/amd/pm: only check sriov vf flag once when creating hwmon sysfs
  drm/amdgpu: Attach eviction fence on alloc
  drm/amdkfd: Improve amdgpu_vm_handle_moved
  drm/amd/display: Increase frame warning limit with KASAN or KCSAN in dml2
  drm/amd/display: Avoid NULL dereference of timing generator
  drm/amdkfd: Update cache info for GFX 9.4.3
  drm/amdkfd: Populate cache info for GFX 9.4.3
  drm/amdgpu: don't put MQDs in VRAM on ARM | ARM64
  drm/amdgpu/smu13: drop compute workload workaround
  ...

1  2 
MAINTAINERS
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c
drivers/gpu/drm/amd/amdgpu/amdgpu_bios.c
drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
drivers/gpu/drm/amd/amdkfd/kfd_topology.c

diff --combined MAINTAINERS
index 79e0a307157f0325bd785caa5c125f5999bd2e11,41b2e0f6c5d6a1cce02c6a09aedf16c76081c12e..978bb58d7d07186043b2f71e3757fc6b38b0fdae
@@@ -294,8 -294,6 +294,8 @@@ F: drivers/pnp/pnpacpi
  F:    include/acpi/
  F:    include/linux/acpi.h
  F:    include/linux/fwnode.h
 +F:    include/linux/fw_table.h
 +F:    lib/fw_table.c
  F:    tools/power/acpi/
  
  ACPI APEI
@@@ -910,7 -908,7 +910,7 @@@ F: drivers/crypto/ccp
  F:    include/linux/ccp.h
  
  AMD CRYPTOGRAPHIC COPROCESSOR (CCP) DRIVER - SEV SUPPORT
 -M:    Brijesh Singh <brijesh.singh@amd.com>
 +M:    Ashish Kalra <ashish.kalra@amd.com>
  M:    Tom Lendacky <thomas.lendacky@amd.com>
  L:    linux-crypto@vger.kernel.org
  S:    Supported
@@@ -1121,7 -1119,7 +1121,7 @@@ ANALOG DEVICES INC AD4130 DRIVE
  M:    Cosmin Tanislav <cosmin.tanislav@analog.com>
  L:    linux-iio@vger.kernel.org
  S:    Supported
 -W:    http://ez.analog.com/community/linux-device-drivers
 +W:    https://ez.analog.com/linux-software-drivers
  F:    Documentation/ABI/testing/sysfs-bus-iio-adc-ad4130
  F:    Documentation/devicetree/bindings/iio/adc/adi,ad4130.yaml
  F:    drivers/iio/adc/ad4130.c
@@@ -1154,7 -1152,7 +1154,7 @@@ ANALOG DEVICES INC AD74115 DRIVE
  M:    Cosmin Tanislav <cosmin.tanislav@analog.com>
  L:    linux-iio@vger.kernel.org
  S:    Supported
 -W:    http://ez.analog.com/community/linux-device-drivers
 +W:    https://ez.analog.com/linux-software-drivers
  F:    Documentation/devicetree/bindings/iio/addac/adi,ad74115.yaml
  F:    drivers/iio/addac/ad74115.c
  
@@@ -1462,6 -1460,7 +1462,6 @@@ F:      drivers/hwmon/applesmc.
  APPLETALK NETWORK LAYER
  L:    netdev@vger.kernel.org
  S:    Odd fixes
 -F:    drivers/net/appletalk/
  F:    include/linux/atalk.h
  F:    include/uapi/linux/atalk.h
  F:    net/appletalk/
@@@ -1800,7 -1799,7 +1800,7 @@@ F:      drivers/irqchip/irq-owl-sirq.
  F:    drivers/mmc/host/owl-mmc.c
  F:    drivers/net/ethernet/actions/
  F:    drivers/pinctrl/actions/*
 -F:    drivers/soc/actions/
 +F:    drivers/pmdomain/actions/
  F:    include/dt-bindings/power/owl-*
  F:    include/dt-bindings/reset/actions,*
  F:    include/linux/soc/actions/
@@@ -1828,13 -1827,6 +1828,13 @@@ N:    allwinne
  N:    sun[x456789]i
  N:    sun[25]0i
  
 +ARM/AMD PENSANDO ARM64 ARCHITECTURE
 +M:    Brad Larson <blarson@amd.com>
 +L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 +S:    Supported
 +F:    Documentation/devicetree/bindings/*/amd,pensando*
 +F:    arch/arm64/boot/dts/amd/elba*
 +
  ARM/Amlogic Meson SoC CLOCK FRAMEWORK
  M:    Neil Armstrong <neil.armstrong@linaro.org>
  M:    Jerome Brunet <jbrunet@baylibre.com>
@@@ -2077,16 -2069,12 +2077,16 @@@ F:   Documentation/trace/coresight/
  F:    drivers/hwtracing/coresight/*
  F:    include/dt-bindings/arm/coresight-cti-dt.h
  F:    include/linux/coresight*
 +F:    include/uapi/linux/coresight*
  F:    samples/coresight/*
 +F:    tools/perf/Documentation/arm-coresight.txt
  F:    tools/perf/arch/arm/util/auxtrace.c
  F:    tools/perf/arch/arm/util/cs-etm.c
  F:    tools/perf/arch/arm/util/cs-etm.h
  F:    tools/perf/arch/arm/util/pmu.c
 +F:    tools/perf/tests/shell/*coresight*
  F:    tools/perf/tests/shell/coresight/*
 +F:    tools/perf/tests/shell/lib/*coresight*
  F:    tools/perf/util/cs-etm-decoder/*
  F:    tools/perf/util/cs-etm.*
  
@@@ -2237,7 -2225,7 +2237,7 @@@ M:      Imre Kaloz <kaloz@openwrt.org
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Maintained
  F:    Documentation/devicetree/bindings/arm/intel-ixp4xx.yaml
 -F:    Documentation/devicetree/bindings/gpio/intel,ixp4xx-gpio.txt
 +F:    Documentation/devicetree/bindings/gpio/intel,ixp4xx-gpio.yaml
  F:    Documentation/devicetree/bindings/interrupt-controller/intel,ixp4xx-interrupt.yaml
  F:    Documentation/devicetree/bindings/memory-controllers/intel,ixp4xx-expansion*
  F:    Documentation/devicetree/bindings/rng/intel,ixp46x-rng.yaml
@@@ -2510,18 -2498,6 +2510,18 @@@ F:    drivers/rtc/rtc-nct3018y.
  F:    include/dt-bindings/clock/nuvoton,npcm7xx-clock.h
  F:    include/dt-bindings/clock/nuvoton,npcm845-clk.h
  
 +ARM/NUVOTON NPCM VIDEO ENGINE DRIVER
 +M:    Joseph Liu <kwliu@nuvoton.com>
 +M:    Marvin Lin <kflin@nuvoton.com>
 +L:    linux-media@vger.kernel.org
 +L:    openbmc@lists.ozlabs.org (moderated for non-subscribers)
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/media/nuvoton,npcm-ece.yaml
 +F:    Documentation/devicetree/bindings/media/nuvoton,npcm-vcd.yaml
 +F:    Documentation/userspace-api/media/drivers/npcm-video.rst
 +F:    drivers/media/platform/nuvoton/
 +F:    include/uapi/linux/npcm-video.h
 +
  ARM/NUVOTON WPCM450 ARCHITECTURE
  M:    Jonathan Neuschäfer <j.neuschaefer@gmx.net>
  L:    openbmc@lists.ozlabs.org (moderated for non-subscribers)
@@@ -3506,14 -3482,6 +3506,14 @@@ W:    http://bcache.evilpiepirate.or
  C:    irc://irc.oftc.net/bcache
  F:    drivers/md/bcache/
  
 +BCACHEFS
 +M:    Kent Overstreet <kent.overstreet@linux.dev>
 +R:    Brian Foster <bfoster@redhat.com>
 +L:    linux-bcachefs@vger.kernel.org
 +S:    Supported
 +C:    irc://irc.oftc.net/bcache
 +F:    fs/bcachefs/
 +
  BDISP ST MEDIA DRIVER
  M:    Fabien Dessenne <fabien.dessenne@foss.st.com>
  L:    linux-media@vger.kernel.org
@@@ -3557,14 -3525,12 +3557,14 @@@ R:   Andy Shevchenko <andriy.shevchenko@l
  R:    Rasmus Villemoes <linux@rasmusvillemoes.dk>
  S:    Maintained
  F:    include/linux/bitfield.h
 +F:    include/linux/bitmap-str.h
  F:    include/linux/bitmap.h
  F:    include/linux/bits.h
  F:    include/linux/cpumask.h
  F:    include/linux/find.h
  F:    include/linux/nodemask.h
  F:    include/vdso/bits.h
 +F:    lib/bitmap-str.c
  F:    lib/bitmap.c
  F:    lib/cpumask.c
  F:    lib/cpumask_kunit.c
@@@ -3648,10 -3614,9 +3648,10 @@@ F:    Documentation/devicetree/bindings/ii
  F:    drivers/iio/accel/bma400*
  
  BPF JIT for ARM
 -M:    Shubham Bansal <illusionist.neo@gmail.com>
 +M:    Russell King <linux@armlinux.org.uk>
 +M:    Puranjay Mohan <puranjay12@gmail.com>
  L:    bpf@vger.kernel.org
 -S:    Odd Fixes
 +S:    Maintained
  F:    arch/arm/net/
  
  BPF JIT for ARM64
@@@ -3795,7 -3760,7 +3795,7 @@@ F:      net/sched/act_bpf.
  F:    net/sched/cls_bpf.c
  F:    samples/bpf/
  F:    scripts/bpf_doc.py
 -F:    scripts/pahole-flags.sh
 +F:    scripts/Makefile.btf
  F:    scripts/pahole-version.sh
  F:    tools/bpf/
  F:    tools/lib/bpf/
@@@ -3831,15 -3796,6 +3831,15 @@@ L:    bpf@vger.kernel.or
  S:    Odd Fixes
  K:    (?:\b|_)bpf(?:\b|_)
  
 +BPF [NETKIT] (BPF-programmable network device)
 +M:    Daniel Borkmann <daniel@iogearbox.net>
 +M:    Nikolay Aleksandrov <razor@blackwall.org>
 +L:    bpf@vger.kernel.org
 +L:    netdev@vger.kernel.org
 +S:    Supported
 +F:    drivers/net/netkit.c
 +F:    include/net/netkit.h
 +
  BPF [NETWORKING] (struct_ops, reuseport)
  M:    Martin KaFai Lau <martin.lau@linux.dev>
  L:    bpf@vger.kernel.org
@@@ -4382,7 -4338,8 +4382,7 @@@ F:      drivers/net/ethernet/broadcom/bcmsys
  F:    drivers/net/ethernet/broadcom/unimac.h
  
  BROADCOM TG3 GIGABIT ETHERNET DRIVER
 -M:    Siva Reddy Kallam <siva.kallam@broadcom.com>
 -M:    Prashant Sreedharan <prashant@broadcom.com>
 +M:    Pavan Chebbi <pavan.chebbi@broadcom.com>
  M:    Michael Chan <mchan@broadcom.com>
  L:    netdev@vger.kernel.org
  S:    Supported
@@@ -4855,13 -4812,6 +4855,13 @@@ X:    drivers/char/ipmi
  X:    drivers/char/random.c
  X:    drivers/char/tpm/
  
 +CHARGERLAB POWER-Z HARDWARE MONITOR DRIVER
 +M:    Thomas Weißschuh <linux@weissschuh.net>
 +L:    linux-hwmon@vger.kernel.org
 +S:    Maintained
 +F:    Documentation/hwmon/powerz.rst
 +F:    drivers/hwmon/powerz.c
 +
  CHECKPATCH
  M:    Andy Whitcroft <apw@canonical.com>
  M:    Joe Perches <joe@perches.com>
@@@ -4979,7 -4929,6 +4979,7 @@@ F:      drivers/spi/spi-cs42l43
  F:    include/dt-bindings/sound/cs*
  F:    include/linux/mfd/cs42l43*
  F:    include/sound/cs*
 +F:    sound/pci/hda/cirrus*
  F:    sound/pci/hda/cs*
  F:    sound/pci/hda/hda_cs_dsp_ctl.*
  F:    sound/soc/codecs/cs*
@@@ -5119,14 -5068,6 +5119,14 @@@ T:    git git://git.kernel.org/pub/scm/lin
  F:    Documentation/devicetree/bindings/timer/
  F:    drivers/clocksource/
  
 +CLOSURES
 +M:    Kent Overstreet <kent.overstreet@linux.dev>
 +L:    linux-bcachefs@vger.kernel.org
 +S:    Supported
 +C:    irc://irc.oftc.net/bcache
 +F:    include/linux/closure.h
 +F:    lib/closure.c
 +
  CMPC ACPI DRIVER
  M:    Thadeu Lima de Souza Cascardo <cascardo@holoscopio.com>
  M:    Daniel Oliveira Nascimento <don@syst.com.br>
@@@ -5258,7 -5199,6 +5258,7 @@@ L:      linux-cxl@vger.kernel.or
  S:    Maintained
  F:    drivers/cxl/
  F:    include/uapi/linux/cxl_mem.h
 +F:    tools/testing/cxl/
  
  COMPUTE EXPRESS LINK PMU (CPMU)
  M:    Jonathan Cameron <jonathan.cameron@huawei.com>
@@@ -5273,12 -5213,6 +5273,12 @@@ S:    Orpha
  W:    http://accessrunner.sourceforge.net/
  F:    drivers/usb/atm/cxacru.c
  
 +CONFIDENTIAL COMPUTING THREAT MODEL FOR X86 VIRTUALIZATION (SNP/TDX)
 +M:    Elena Reshetova <elena.reshetova@intel.com>
 +M:    Carlos Bilbao <carlos.bilbao@amd.com>
 +S:    Maintained
 +F:    Documentation/security/snp-tdx-threat-model.rst
 +
  CONFIGFS
  M:    Joel Becker <jlbec@evilplan.org>
  M:    Christoph Hellwig <hch@lst.de>
@@@ -5353,7 -5287,6 +5353,7 @@@ S:      Maintaine
  F:    mm/memcontrol.c
  F:    mm/swap_cgroup.c
  F:    tools/testing/selftests/cgroup/memcg_protection.m
 +F:    tools/testing/selftests/cgroup/test_hugetlb_memcg.c
  F:    tools/testing/selftests/cgroup/test_kmem.c
  F:    tools/testing/selftests/cgroup/test_memcontrol.c
  
@@@ -5394,6 -5327,12 +5394,6 @@@ M:     Bence Csókás <bence98@sch.bme.hu
  S:    Maintained
  F:    drivers/i2c/busses/i2c-cp2615.c
  
 -CPMAC ETHERNET DRIVER
 -M:    Florian Fainelli <f.fainelli@gmail.com>
 -L:    netdev@vger.kernel.org
 -S:    Maintained
 -F:    drivers/net/ethernet/ti/cpmac.c
 -
  CPU FREQUENCY DRIVERS - VEXPRESS SPC ARM BIG LITTLE
  M:    Viresh Kumar <viresh.kumar@linaro.org>
  M:    Sudeep Holla <sudeep.holla@arm.com>
@@@ -5677,7 -5616,7 +5677,7 @@@ M:      Andrew Donnellan <ajd@linux.ibm.com
  L:    linuxppc-dev@lists.ozlabs.org
  S:    Supported
  F:    Documentation/ABI/testing/sysfs-class-cxl
 -F:    Documentation/powerpc/cxl.rst
 +F:    Documentation/arch/powerpc/cxl.rst
  F:    arch/powerpc/platforms/powernv/pci-cxl.c
  F:    drivers/misc/cxl/
  F:    include/misc/cxl*
@@@ -5689,7 -5628,7 +5689,7 @@@ M:      Matthew R. Ochs <mrochs@linux.ibm.co
  M:    Uma Krishnan <ukrishn@linux.ibm.com>
  L:    linux-scsi@vger.kernel.org
  S:    Supported
 -F:    Documentation/powerpc/cxlflash.rst
 +F:    Documentation/arch/powerpc/cxlflash.rst
  F:    drivers/scsi/cxlflash/
  F:    include/uapi/scsi/cxlflash_ioctl.h
  
@@@ -6064,7 -6003,6 +6064,7 @@@ F:      include/linux/devm-helpers.
  DEVICE-MAPPER  (LVM)
  M:    Alasdair Kergon <agk@redhat.com>
  M:    Mike Snitzer <snitzer@kernel.org>
 +M:    Mikulas Patocka <mpatocka@redhat.com>
  M:    dm-devel@lists.linux.dev
  L:    dm-devel@lists.linux.dev
  S:    Maintained
@@@ -6155,13 -6093,6 +6155,13 @@@ L:    linux-gpio@vger.kernel.or
  S:    Maintained
  F:    drivers/gpio/gpio-gpio-mm.c
  
 +DIGITEQ AUTOMOTIVE MGB4 V4L2 DRIVER
 +M:    Martin Tuma <martin.tuma@digiteqautomotive.com>
 +L:    linux-media@vger.kernel.org
 +S:    Maintained
 +F:    Documentation/admin-guide/media/mgb4.rst
 +F:    drivers/media/pci/mgb4/
 +
  DIOLAN U2C-12 I2C DRIVER
  M:    Guenter Roeck <linux@roeck-us.net>
  L:    linux-i2c@vger.kernel.org
@@@ -6202,11 -6133,11 +6202,11 @@@ F:   drivers/video/fbdev/udlfb.
  F:    include/video/udlfb.h
  
  DISTRIBUTED LOCK MANAGER (DLM)
 -M:    Christine Caulfield <ccaulfie@redhat.com>
 +M:    Alexander Aring <aahringo@redhat.com>
  M:    David Teigland <teigland@redhat.com>
  L:    gfs2@lists.linux.dev
  S:    Supported
 -W:    http://sources.redhat.com/cluster/
 +W:    https://pagure.io/dlm
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm.git
  F:    fs/dlm/
  
@@@ -6422,17 -6353,6 +6422,17 @@@ F:    Documentation/networking/device_driv
  F:    drivers/net/ethernet/freescale/dpaa2/dpaa2-switch*
  F:    drivers/net/ethernet/freescale/dpaa2/dpsw*
  
 +DPLL SUBSYSTEM
 +M:    Vadim Fedorenko <vadim.fedorenko@linux.dev>
 +M:    Arkadiusz Kubalewski <arkadiusz.kubalewski@intel.com>
 +M:    Jiri Pirko <jiri@resnulli.us>
 +L:    netdev@vger.kernel.org
 +S:    Supported
 +F:    Documentation/driver-api/dpll.rst
 +F:    drivers/dpll/*
 +F:    include/linux/dpll.h
 +F:    include/uapi/linux/dpll.h
 +
  DRBD DRIVER
  M:    Philipp Reisner <philipp.reisner@linbit.com>
  M:    Lars Ellenberg <lars.ellenberg@linbit.com>
@@@ -6848,7 -6768,7 +6848,7 @@@ F:      drivers/gpu/drm/panel/panel-sitronix
  DRM DRIVER FOR SITRONIX ST7703 PANELS
  M:    Guido Günther <agx@sigxcpu.org>
  R:    Purism Kernel Team <kernel@puri.sm>
 -R:    Ondrej Jirman <megous@megous.com>
 +R:    Ondrej Jirman <megi@xff.cz>
  S:    Maintained
  F:    Documentation/devicetree/bindings/display/panel/rocktech,jh057n00900.yaml
  F:    drivers/gpu/drm/panel/panel-sitronix-st7703.c
@@@ -7133,7 -7053,7 +7133,7 @@@ F:      drivers/gpu/host1x
  F:    include/linux/host1x.h
  F:    include/uapi/drm/tegra_drm.h
  
- DRM DRIVERS FOR RENESAS
+ DRM DRIVERS FOR RENESAS R-CAR
  M:    Laurent Pinchart <laurent.pinchart@ideasonboard.com>
  M:    Kieran Bingham <kieran.bingham+renesas@ideasonboard.com>
  L:    dri-devel@lists.freedesktop.org
@@@ -7144,7 -7064,16 +7144,16 @@@ F:    Documentation/devicetree/bindings/di
  F:    Documentation/devicetree/bindings/display/bridge/renesas,dw-hdmi.yaml
  F:    Documentation/devicetree/bindings/display/bridge/renesas,lvds.yaml
  F:    Documentation/devicetree/bindings/display/renesas,du.yaml
- F:    drivers/gpu/drm/renesas/
+ F:    drivers/gpu/drm/renesas/rcar-du/
+ DRM DRIVERS FOR RENESAS SHMOBILE
+ M:    Laurent Pinchart <laurent.pinchart@ideasonboard.com>
+ M:    Geert Uytterhoeven <geert+renesas@glider.be>
+ L:    dri-devel@lists.freedesktop.org
+ L:    linux-renesas-soc@vger.kernel.org
+ S:    Supported
+ F:    Documentation/devicetree/bindings/display/renesas,shmobile-lcdc.yaml
+ F:    drivers/gpu/drm/renesas/shmobile/
  F:    include/linux/platform_data/shmob_drm.h
  
  DRM DRIVERS FOR ROCKCHIP
@@@ -8156,27 -8085,6 +8165,27 @@@ F:    include/linux/fs_types.
  F:    include/uapi/linux/fs.h
  F:    include/uapi/linux/openat2.h
  
 +FILESYSTEMS [EXPORTFS]
 +M:    Chuck Lever <chuck.lever@oracle.com>
 +M:    Jeff Layton <jlayton@kernel.org>
 +R:    Amir Goldstein <amir73il@gmail.com>
 +L:    linux-fsdevel@vger.kernel.org
 +L:    linux-nfs@vger.kernel.org
 +S:    Supported
 +F:    Documentation/filesystems/nfs/exporting.rst
 +F:    fs/exportfs/
 +F:    fs/fhandle.c
 +F:    include/linux/exportfs.h
 +
 +FILESYSTEMS [IOMAP]
 +M:    Christian Brauner <brauner@kernel.org>
 +R:    Darrick J. Wong <djwong@kernel.org>
 +L:    linux-xfs@vger.kernel.org
 +L:    linux-fsdevel@vger.kernel.org
 +S:    Supported
 +F:    fs/iomap/
 +F:    include/linux/iomap.h
 +
  FINTEK F75375S HARDWARE MONITOR AND FAN CONTROLLER DRIVER
  M:    Riku Voipio <riku.voipio@iki.fi>
  L:    linux-hwmon@vger.kernel.org
@@@ -8268,7 -8176,7 +8277,7 @@@ M:      Geoffrey D. Bennett <g@b4.vu
  L:    alsa-devel@alsa-project.org (moderated for non-subscribers)
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git
 -F:    sound/usb/mixer_scarlett_gen2.c
 +F:    sound/usb/mixer_scarlett2.c
  
  FORCEDETH GIGABIT ETHERNET DRIVER
  M:    Rain River <rain.1986.08.12@gmail.com>
@@@ -8381,14 -8289,6 +8390,14 @@@ F:    Documentation/devicetree/bindings/sp
  F:    drivers/spi/spi-fsl-dspi.c
  F:    include/linux/spi/spi-fsl-dspi.h
  
 +FREESCALE eDMA DRIVER
 +M:    Frank Li <Frank.Li@nxp.com>
 +L:    imx@lists.linux.dev
 +L:    dmaengine@vger.kernel.org
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/dma/fsl,edma.yaml
 +F:    drivers/dma/fsl-edma*.*
 +
  FREESCALE ENETC ETHERNET DRIVERS
  M:    Claudiu Manoil <claudiu.manoil@nxp.com>
  M:    Vladimir Oltean <vladimir.oltean@nxp.com>
@@@ -8767,8 -8667,6 +8776,8 @@@ L:      linux-hardening@vger.kernel.or
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git for-next/hardening
  F:    Documentation/kbuild/gcc-plugins.rst
 +F:    include/linux/stackleak.h
 +F:    kernel/stackleak.c
  F:    scripts/Makefile.gcc-plugins
  F:    scripts/gcc-plugins/
  
@@@ -8865,7 -8763,6 +8874,7 @@@ F:      include/linux/phy
  GENERIC PINCTRL I2C DEMULTIPLEXER DRIVER
  M:    Wolfram Sang <wsa+renesas@sang-engineering.com>
  S:    Supported
 +F:    Documentation/devicetree/bindings/i2c/i2c-demux-pinctrl.yaml
  F:    drivers/i2c/muxes/i2c-demux-pinctrl.c
  
  GENERIC PM DOMAINS
@@@ -8885,13 -8782,6 +8894,13 @@@ S:    Supporte
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/linux-pm.git
  F:    drivers/pmdomain/
  
 +GENERIC RADIX TREE
 +M:    Kent Overstreet <kent.overstreet@linux.dev>
 +S:    Supported
 +C:    irc://irc.oftc.net/bcache
 +F:    include/linux/generic-radix-tree.h
 +F:    lib/generic-radix-tree.c
 +
  GENERIC RESISTIVE TOUCHSCREEN ADC DRIVER
  M:    Eugen Hristev <eugen.hristev@microchip.com>
  L:    linux-input@vger.kernel.org
@@@ -9132,13 -9022,6 +9141,13 @@@ F:    drivers/staging/greybus/sdio.
  F:    drivers/staging/greybus/spi.c
  F:    drivers/staging/greybus/spilib.c
  
 +GREYBUS BEAGLEPLAY DRIVERS
 +M:    Ayush Singh <ayushdevel1325@gmail.com>
 +L:    greybus-dev@lists.linaro.org (moderated for non-subscribers)
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/net/ti,cc1352p7.yaml
 +F:    drivers/greybus/gb-beagleplay.c
 +
  GREYBUS SUBSYSTEM
  M:    Johan Hovold <johan@kernel.org>
  M:    Alex Elder <elder@kernel.org>
@@@ -9820,7 -9703,6 +9829,7 @@@ F:      include/linux/hugetlb.
  F:    mm/hugetlb.c
  F:    mm/hugetlb_vmemmap.c
  F:    mm/hugetlb_vmemmap.h
 +F:    tools/testing/selftests/cgroup/test_hugetlb_memcg.c
  
  HVA ST MEDIA DRIVER
  M:    Jean-Christophe Trotin <jean-christophe.trotin@foss.st.com>
@@@ -10103,6 -9985,12 +10112,6 @@@ F:   Documentation/driver-api/i3
  F:    drivers/i3c/
  F:    include/linux/i3c/
  
 -IA64 (Itanium) PLATFORM
 -L:    linux-ia64@vger.kernel.org
 -S:    Orphan
 -F:    Documentation/arch/ia64/
 -F:    arch/ia64/
 -
  IBM Operation Panel Input Driver
  M:    Eddie James <eajames@linux.ibm.com>
  L:    linux-input@vger.kernel.org
@@@ -10598,6 -10486,7 +10607,6 @@@ F:   drivers/platform/x86/intel/atomisp2/
  
  INTEL BIOS SAR INT1092 DRIVER
  M:    Shravan Sudhakar <s.shravan@intel.com>
 -M:    Intel Corporation <linuxwwan@intel.com>
  L:    platform-driver-x86@vger.kernel.org
  S:    Maintained
  F:    drivers/platform/x86/intel/int1092/
@@@ -10848,7 -10737,7 +10857,7 @@@ F:   drivers/mfd/intel-m10-bmc
  F:    include/linux/mfd/intel-m10-bmc.h
  
  INTEL MAX10 BMC SECURE UPDATES
 -M:    Russ Weight <russell.h.weight@intel.com>
 +M:    Peter Colberg <peter.colberg@intel.com>
  L:    linux-fpga@vger.kernel.org
  S:    Maintained
  F:    Documentation/ABI/testing/sysfs-driver-intel-m10-bmc-sec-update
@@@ -11028,6 -10917,7 +11037,6 @@@ F:   drivers/platform/x86/intel/wmi/thund
  
  INTEL WWAN IOSM DRIVER
  M:    M Chetan Kumar <m.chetan.kumar@intel.com>
 -M:    Intel Corporation <linuxwwan@intel.com>
  L:    netdev@vger.kernel.org
  S:    Maintained
  F:    drivers/net/wwan/iosm/
@@@ -11097,6 -10987,15 +11106,6 @@@ L:  linux-mips@vger.kernel.or
  S:    Maintained
  F:    drivers/net/ethernet/sgi/ioc3-eth.c
  
 -IOMAP FILESYSTEM LIBRARY
 -M:    Darrick J. Wong <djwong@kernel.org>
 -L:    linux-xfs@vger.kernel.org
 -L:    linux-fsdevel@vger.kernel.org
 -S:    Supported
 -T:    git git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git
 -F:    fs/iomap/
 -F:    include/linux/iomap.h
 -
  IOMMU DMA-API LAYER
  M:    Robin Murphy <robin.murphy@arm.com>
  L:    iommu@lists.linux.dev
@@@ -11279,6 -11178,7 +11288,6 @@@ M:   Sagi Grimberg <sagi@grimberg.me
  L:    linux-rdma@vger.kernel.org
  L:    target-devel@vger.kernel.org
  S:    Supported
 -W:    http://www.linux-iscsi.org
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending.git master
  F:    drivers/infiniband/ulp/isert
  
@@@ -11528,20 -11428,16 +11537,20 @@@ F:        usr
  
  KERNEL HARDENING (not covered by other areas)
  M:    Kees Cook <keescook@chromium.org>
 +R:    Gustavo A. R. Silva <gustavoars@kernel.org>
  L:    linux-hardening@vger.kernel.org
  S:    Supported
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git for-next/hardening
  F:    Documentation/ABI/testing/sysfs-kernel-oops_count
  F:    Documentation/ABI/testing/sysfs-kernel-warn_count
 +F:    arch/*/configs/hardening.config
  F:    include/linux/overflow.h
  F:    include/linux/randomize_kstack.h
 +F:    kernel/configs/hardening.config
  F:    mm/usercopy.c
  K:    \b(add|choose)_random_kstack_offset\b
  K:    \b__check_(object_size|heap_object)\b
 +K:    \b__counted_by\b
  
  KERNEL JANITORS
  L:    kernel-janitors@vger.kernel.org
@@@ -11560,6 -11456,7 +11569,6 @@@ S:   Supporte
  W:    http://nfs.sourceforge.net/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux.git
  F:    Documentation/filesystems/nfs/
 -F:    fs/exportfs/
  F:    fs/lockd/
  F:    fs/nfs_common/
  F:    fs/nfsd/
@@@ -11661,18 -11558,6 +11670,18 @@@ F: include/kvm/arm_
  F:    tools/testing/selftests/kvm/*/aarch64/
  F:    tools/testing/selftests/kvm/aarch64/
  
 +KERNEL VIRTUAL MACHINE FOR LOONGARCH (KVM/LoongArch)
 +M:    Tianrui Zhao <zhaotianrui@loongson.cn>
 +M:    Bibo Mao <maobibo@loongson.cn>
 +M:    Huacai Chen <chenhuacai@kernel.org>
 +L:    kvm@vger.kernel.org
 +L:    loongarch@lists.linux.dev
 +S:    Maintained
 +T:    git git://git.kernel.org/pub/scm/virt/kvm/kvm.git
 +F:    arch/loongarch/include/asm/kvm*
 +F:    arch/loongarch/include/uapi/asm/kvm*
 +F:    arch/loongarch/kvm/
 +
  KERNEL VIRTUAL MACHINE FOR MIPS (KVM/mips)
  M:    Huacai Chen <chenhuacai@kernel.org>
  L:    linux-mips@vger.kernel.org
@@@ -11709,7 -11594,6 +11718,7 @@@ F:   arch/riscv/include/asm/kvm
  F:    arch/riscv/include/uapi/asm/kvm*
  F:    arch/riscv/kvm/
  F:    tools/testing/selftests/kvm/*/riscv/
 +F:    tools/testing/selftests/kvm/riscv/
  
  KERNEL VIRTUAL MACHINE for s390 (KVM/s390)
  M:    Christian Borntraeger <borntraeger@linux.ibm.com>
@@@ -12046,6 -11930,12 +12055,6 @@@ F:  drivers/leds
  F:    include/dt-bindings/leds/
  F:    include/linux/leds.h
  
 -LEGACY EEPROM DRIVER
 -M:    Jean Delvare <jdelvare@suse.com>
 -S:    Maintained
 -F:    Documentation/misc-devices/eeprom.rst
 -F:    drivers/misc/eeprom/eeprom.c
 -
  LEGO MINDSTORMS EV3
  R:    David Lechner <david@lechnology.com>
  S:    Maintained
@@@ -12241,7 -12131,7 +12250,7 @@@ F:   Documentation/ABI/stable/sysfs-firmw
  F:    Documentation/devicetree/bindings/i2c/i2c-opal.txt
  F:    Documentation/devicetree/bindings/powerpc/
  F:    Documentation/devicetree/bindings/rtc/rtc-opal.txt
 -F:    Documentation/powerpc/
 +F:    Documentation/arch/powerpc/
  F:    arch/powerpc/
  F:    drivers/*/*/*pasemi*
  F:    drivers/*/*pasemi*
@@@ -12597,14 -12487,6 +12606,14 @@@ F: drivers/hwmon/ltc2947-i2c.
  F:    drivers/hwmon/ltc2947-spi.c
  F:    drivers/hwmon/ltc2947.h
  
 +LTC2991 HARDWARE MONITOR DRIVER
 +M:    Antoniu Miclaus <antoniu.miclaus@analog.com>
 +L:    linux-hwmon@vger.kernel.org
 +S:    Supported
 +W:    https://ez.analog.com/linux-software-drivers
 +F:    Documentation/devicetree/bindings/hwmon/adi,ltc2991.yaml
 +F:    drivers/hwmon/ltc2991.c
 +
  LTC2983 IIO TEMPERATURE DRIVER
  M:    Nuno Sá <nuno.sa@analog.com>
  L:    linux-iio@vger.kernel.org
@@@ -12972,7 -12854,7 +12981,7 @@@ MAX31827 TEMPERATURE SWITCH DRIVE
  M:    Daniel Matyas <daniel.matyas@analog.com>
  L:    linux-hwmon@vger.kernel.org
  S:    Supported
 -W:    http://ez.analog.com/community/linux-device-drivers
 +W:    https://ez.analog.com/linux-software-drivers
  F:    Documentation/devicetree/bindings/hwmon/adi,max31827.yaml
  F:    Documentation/hwmon/max31827.rst
  F:    drivers/hwmon/max31827.c
@@@ -13656,6 -13538,7 +13665,6 @@@ F:   net/dsa/tag_mtk.
  
  MEDIATEK T7XX 5G WWAN MODEM DRIVER
  M:    Chandrashekar Devegowda <chandrashekar.devegowda@intel.com>
 -M:    Intel Corporation <linuxwwan@intel.com>
  R:    Chiranjeevi Rapolu <chiranjeevi.rapolu@linux.intel.com>
  R:    Liu Haijun <haijun.liu@mediatek.com>
  R:    M Chetan Kumar <m.chetan.kumar@linux.intel.com>
@@@ -13686,7 -13569,6 +13695,7 @@@ MEGARAID SCSI/SAS DRIVER
  M:    Kashyap Desai <kashyap.desai@broadcom.com>
  M:    Sumit Saxena <sumit.saxena@broadcom.com>
  M:    Shivasharan S <shivasharan.srikanteshwara@broadcom.com>
 +M:    Chandrakanth patil <chandrakanth.patil@broadcom.com>
  L:    megaraidlinux.pdl@broadcom.com
  L:    linux-scsi@vger.kernel.org
  S:    Maintained
@@@ -13820,12 -13702,6 +13829,12 @@@ F: drivers/infiniband/hw/mlx5
  F:    include/linux/mlx5/
  F:    include/uapi/rdma/mlx5-abi.h
  
 +MELLANOX MLX5 VDPA DRIVER
 +M:    Dragos Tatulea <dtatulea@nvidia.com>
 +L:    virtualization@lists.linux-foundation.org
 +S:    Supported
 +F:    drivers/vdpa/mlx5/
 +
  MELLANOX MLXCPLD I2C AND MUX DRIVER
  M:    Vadim Pasternak <vadimp@nvidia.com>
  M:    Michael Shych <michaelsh@nvidia.com>
@@@ -14006,10 -13882,9 +14015,10 @@@ F: Documentation/devicetree/bindings/me
  F:    drivers/staging/media/meson/vdec/
  
  METHODE UDPU SUPPORT
 -M:    Vladimir Vid <vladimir.vid@sartura.hr>
 +M:    Robert Marko <robert.marko@sartura.hr>
  S:    Maintained
 -F:    arch/arm64/boot/dts/marvell/armada-3720-uDPU.dts
 +F:    arch/arm64/boot/dts/marvell/armada-3720-eDPU.dts
 +F:    arch/arm64/boot/dts/marvell/armada-3720-uDPU.*
  
  MHI BUS
  M:    Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
@@@ -14179,13 -14054,6 +14188,13 @@@ S: Supporte
  F:    Documentation/devicetree/bindings/regulator/mcp16502-regulator.txt
  F:    drivers/regulator/mcp16502.c
  
 +MICROCHIP MCP3564 ADC DRIVER
 +M:      Marius Cristea <marius.cristea@microchip.com>
 +L:      linux-iio@vger.kernel.org
 +S:      Supported
 +F:      Documentation/devicetree/bindings/iio/adc/microchip,mcp3564.yaml
 +F:      drivers/iio/adc/mcp3564.c
 +
  MICROCHIP MCP3911 ADC DRIVER
  M:    Marcus Folkesson <marcus.folkesson@gmail.com>
  M:    Kent Gustavsson <kent@minoris.se>
@@@ -14195,7 -14063,7 +14204,7 @@@ F:   Documentation/devicetree/bindings/ii
  F:    drivers/iio/adc/mcp3911.c
  
  MICROCHIP MMC/SD/SDIO MCI DRIVER
 -M:    Ludovic Desroches <ludovic.desroches@microchip.com>
 +M:    Aubin Constans <aubin.constans@microchip.com>
  S:    Maintained
  F:    drivers/mmc/host/atmel-mci.c
  
@@@ -14514,11 -14382,9 +14523,11 @@@ MIPS/LOONGSON1 ARCHITECTUR
  M:    Keguang Zhang <keguang.zhang@gmail.com>
  L:    linux-mips@vger.kernel.org
  S:    Maintained
 +F:    Documentation/devicetree/bindings/*/loongson,ls1*.yaml
  F:    arch/mips/include/asm/mach-loongson32/
  F:    arch/mips/loongson32/
  F:    drivers/*/*loongson1*
 +F:    drivers/net/ethernet/stmicro/stmmac/dwmac-loongson1.c
  
  MIPS/LOONGSON2EF ARCHITECTURE
  M:    Jiaxun Yang <jiaxun.yang@flygoat.com>
@@@ -14546,11 -14412,6 +14555,11 @@@ W: https://linuxtv.or
  T:    git git://linuxtv.org/media_tree.git
  F:    drivers/media/radio/radio-miropcm20*
  
 +MITSUMI MM8013 FG DRIVER
 +M:    Konrad Dybcio <konradybcio@kernel.org>
 +F:    Documentation/devicetree/bindings/power/supply/mitsumi,mm8013.yaml
 +F:    drivers/power/supply/mm8013.c
 +
  MMP SUPPORT
  R:    Lubomir Rintel <lkundrak@v3.sk>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
@@@ -14605,7 -14466,7 +14614,7 @@@ L:   linux-kernel@vger.kernel.or
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux.git modules-next
  F:    include/linux/kmod.h
 -F:    include/linux/module.h
 +F:    include/linux/module*.h
  F:    kernel/module/
  F:    lib/test_kmod.c
  F:    scripts/module*
@@@ -14714,14 -14575,6 +14723,14 @@@ L: linux-mtd@lists.infradead.or
  S:    Maintained
  F:    drivers/mtd/devices/docg3*
  
 +MT9M114 ONSEMI SENSOR DRIVER
 +M:    Laurent Pinchart <laurent.pinchart@ideasonboard.com>
 +L:    linux-media@vger.kernel.org
 +S:    Maintained
 +T:    git git://linuxtv.org/media_tree.git
 +F:    Documentation/devicetree/bindings/media/i2c/onnn,mt9m114.yaml
 +F:    drivers/media/i2c/mt9m114.c
 +
  MT9P031 APTINA CAMERA SENSOR
  M:    Laurent Pinchart <laurent.pinchart@ideasonboard.com>
  L:    linux-media@vger.kernel.org
@@@ -15138,11 -14991,10 +15147,11 @@@ W:        https://github.com/multipath-tcp/mpt
  B:    https://github.com/multipath-tcp/mptcp_net-next/issues
  T:    git https://github.com/multipath-tcp/mptcp_net-next.git export-net
  T:    git https://github.com/multipath-tcp/mptcp_net-next.git export
 +F:    Documentation/netlink/specs/mptcp.yaml
  F:    Documentation/networking/mptcp-sysctl.rst
  F:    include/net/mptcp.h
  F:    include/trace/events/mptcp.h
 -F:    include/uapi/linux/mptcp.h
 +F:    include/uapi/linux/mptcp*.h
  F:    net/mptcp/
  F:    tools/testing/selftests/bpf/*/*mptcp*.c
  F:    tools/testing/selftests/net/mptcp/
@@@ -15315,7 -15167,7 +15324,7 @@@ NOLIBC HEADER FIL
  M:    Willy Tarreau <w@1wt.eu>
  M:    Thomas Weißschuh <linux@weissschuh.net>
  S:    Maintained
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/wtarreau/nolibc.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/nolibc/linux-nolibc.git
  F:    tools/include/nolibc/
  F:    tools/testing/selftests/nolibc/
  
@@@ -15608,7 -15460,7 +15617,7 @@@ NXP TFA9879 DRIVE
  M:    Peter Rosin <peda@axentia.se>
  L:    alsa-devel@alsa-project.org (moderated for non-subscribers)
  S:    Maintained
 -F:    Documentation/devicetree/bindings/sound/tfa9879.txt
 +F:    Documentation/devicetree/bindings/sound/nxp,tfa9879.yaml
  F:    sound/soc/codecs/tfa9879*
  
  NXP-NCI NFC DRIVER
@@@ -15645,13 -15497,6 +15654,13 @@@ F: include/linux/objagg.
  F:    lib/objagg.c
  F:    lib/test_objagg.c
  
 +OBJPOOL
 +M:    Matt Wu <wuqiang.matt@bytedance.com>
 +S:    Supported
 +F:    include/linux/objpool.h
 +F:    lib/objpool.c
 +F:    lib/test_objpool.c
 +
  OBJTOOL
  M:    Josh Poimboeuf <jpoimboe@kernel.org>
  M:    Peter Zijlstra <peterz@infradead.org>
@@@ -15964,7 -15809,7 +15973,7 @@@ L:   linux-media@vger.kernel.or
  S:    Maintained
  T:    git git://linuxtv.org/media_tree.git
  F:    Documentation/devicetree/bindings/media/i2c/ovti,ov4689.yaml
 -F:    drivers/media/i2c/ov5647.c
 +F:    drivers/media/i2c/ov4689.c
  
  OMNIVISION OV5640 SENSOR DRIVER
  M:    Steve Longerbeam <slongerbeam@gmail.com>
@@@ -16054,7 -15899,8 +16063,7 @@@ F:   Documentation/devicetree/bindings/me
  F:    drivers/media/i2c/ov8858.c
  
  OMNIVISION OV9282 SENSOR DRIVER
 -M:    Paul J. Murphy <paul.j.murphy@intel.com>
 -M:    Daniele Alessandrelli <daniele.alessandrelli@intel.com>
 +M:    Dave Stevenson <dave.stevenson@raspberrypi.com>
  L:    linux-media@vger.kernel.org
  S:    Maintained
  T:    git git://linuxtv.org/media_tree.git
@@@ -16162,7 -16008,6 +16171,7 @@@ F:   Documentation/ABI/testing/sysfs-firm
  F:    drivers/of/
  F:    include/linux/of*.h
  F:    scripts/dtc/
 +F:    tools/testing/selftests/dt/
  K:    of_overlay_notifier_
  K:    of_overlay_fdt_apply
  K:    of_overlay_remove
@@@ -16461,6 -16306,11 +16470,6 @@@ L:  linux-i2c@vger.kernel.or
  S:    Maintained
  F:    drivers/i2c/muxes/i2c-mux-pca9541.c
  
 -PCDP - PRIMARY CONSOLE AND DEBUG PORT
 -M:    Khalid Aziz <khalid@gonehiking.org>
 -S:    Maintained
 -F:    drivers/firmware/pcdp.*
 -
  PCI DRIVER FOR AARDVARK (Marvell Armada 3700)
  M:    Thomas Petazzoni <thomas.petazzoni@bootlin.com>
  M:    Pali Rohár <pali@kernel.org>
@@@ -16611,7 -16461,6 +16620,7 @@@ L:   linux-renesas-soc@vger.kernel.or
  S:    Maintained
  F:    Documentation/devicetree/bindings/pci/*rcar*
  F:    drivers/pci/controller/*rcar*
 +F:    drivers/pci/controller/dwc/*rcar*
  
  PCI DRIVER FOR SAMSUNG EXYNOS
  M:    Jingoo Han <jingoohan1@gmail.com>
@@@ -16679,7 -16528,7 +16688,7 @@@ R:   Oliver O'Halloran <oohall@gmail.com
  L:    linuxppc-dev@lists.ozlabs.org
  S:    Supported
  F:    Documentation/PCI/pci-error-recovery.rst
 -F:    Documentation/powerpc/eeh-pci-error-recovery.rst
 +F:    Documentation/arch/powerpc/eeh-pci-error-recovery.rst
  F:    arch/powerpc/include/*/eeh*.h
  F:    arch/powerpc/kernel/eeh*.c
  F:    arch/powerpc/platforms/*/eeh*.c
@@@ -17728,6 -17577,15 +17737,6 @@@ L:  netdev@vger.kernel.or
  S:    Supported
  F:    drivers/net/ethernet/qlogic/qlcnic/
  
 -QLOGIC QLGE 10Gb ETHERNET DRIVER
 -M:    Manish Chopra <manishc@marvell.com>
 -M:    GR-Linux-NIC-Dev@marvell.com
 -M:    Coiby Xu <coiby.xu@gmail.com>
 -L:    netdev@vger.kernel.org
 -S:    Supported
 -F:    Documentation/networking/device_drivers/qlogic/qlge.rst
 -F:    drivers/staging/qlge/
 -
  QM1D1B0004 MEDIA DRIVER
  M:    Akihiro Tsukada <tskd08@gmail.com>
  L:    linux-media@vger.kernel.org
@@@ -17980,18 -17838,6 +17989,18 @@@ S: Maintaine
  F:    Documentation/devicetree/bindings/mtd/qcom,nandc.yaml
  F:    drivers/mtd/nand/raw/qcom_nandc.c
  
 +QUALCOMM QSEECOM DRIVER
 +M:    Maximilian Luz <luzmaximilian@gmail.com>
 +L:    linux-arm-msm@vger.kernel.org
 +S:    Maintained
 +F:    drivers/firmware/qcom/qcom_qseecom.c
 +
 +QUALCOMM QSEECOM UEFISECAPP DRIVER
 +M:    Maximilian Luz <luzmaximilian@gmail.com>
 +L:    linux-arm-msm@vger.kernel.org
 +S:    Maintained
 +F:    drivers/firmware/qcom/qcom_qseecom_uefisecapp.c
 +
  QUALCOMM RMNET DRIVER
  M:    Subash Abhinov Kasiviswanathan <quic_subashab@quicinc.com>
  M:    Sean Tranchetti <quic_stranche@quicinc.com>
@@@ -18119,6 -17965,7 +18128,6 @@@ F:   arch/mips/boot/dts/ralink/mt7621
  
  RALINK RT2X00 WIRELESS LAN DRIVER
  M:    Stanislaw Gruszka <stf_xl@wp.pl>
 -M:    Helmut Schaa <helmut.schaa@googlemail.com>
  L:    linux-wireless@vger.kernel.org
  S:    Maintained
  F:    drivers/net/wireless/ralink/rt2x00/
@@@ -18608,7 -18455,7 +18617,7 @@@ L:   linux-riscv@lists.infradead.or
  S:    Supported
  Q:    https://patchwork.kernel.org/project/linux-riscv/list/
  C:    irc://irc.libera.chat/riscv
 -P:    Documentation/riscv/patch-acceptance.rst
 +P:    Documentation/arch/riscv/patch-acceptance.rst
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git
  F:    arch/riscv/
  N:    riscv
@@@ -18703,7 -18550,6 +18712,7 @@@ F:   sound/soc/rockchip/rockchip_i2s_tdm.
  
  ROCKCHIP ISP V1 DRIVER
  M:    Dafna Hirschfeld <dafna@fastmail.com>
 +M:    Laurent Pinchart <laurent.pinchart@ideasonboard.com>
  L:    linux-media@vger.kernel.org
  L:    linux-rockchip@lists.infradead.org
  S:    Maintained
@@@ -18754,12 -18600,6 +18763,12 @@@ S: Maintaine
  F:    Documentation/devicetree/bindings/iio/light/bh1750.yaml
  F:    drivers/iio/light/bh1750.c
  
 +ROHM BM1390 PRESSURE SENSOR DRIVER
 +M:    Matti Vaittinen <mazziesaccount@gmail.com>
 +L:    linux-iio@vger.kernel.org
 +S:    Supported
 +F:    drivers/iio/pressure/rohm-bm1390.c
 +
  ROHM BU270xx LIGHT SENSOR DRIVERs
  M:    Matti Vaittinen <mazziesaccount@gmail.com>
  L:    linux-iio@vger.kernel.org
@@@ -18902,10 -18742,9 +18911,10 @@@ R: Andreas Hindborg <a.hindborg@samsung
  R:    Alice Ryhl <aliceryhl@google.com>
  L:    rust-for-linux@vger.kernel.org
  S:    Supported
 -W:    https://github.com/Rust-for-Linux/linux
 +W:    https://rust-for-linux.com
  B:    https://github.com/Rust-for-Linux/linux/issues
  C:    zulip://rust-for-linux.zulipchat.com
 +P:    https://rust-for-linux.com/contributing
  T:    git https://github.com/Rust-for-Linux/linux.git rust-next
  F:    Documentation/rust/
  F:    rust/
@@@ -19357,6 -19196,7 +19366,6 @@@ M:   "Martin K. Petersen" <martin.peterse
  L:    linux-scsi@vger.kernel.org
  L:    target-devel@vger.kernel.org
  S:    Supported
 -W:    http://www.linux-iscsi.org
  Q:    https://patchwork.kernel.org/project/target-devel/list/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git
  F:    Documentation/target/
@@@ -19439,8 -19279,7 +19448,8 @@@ F:   Documentation/devicetree/bindings/mm
  F:    drivers/mmc/host/sdhci*
  
  SECURE DIGITAL HOST CONTROLLER INTERFACE (SDHCI) MICROCHIP DRIVER
 -M:    Eugen Hristev <eugen.hristev@microchip.com>
 +M:    Aubin Constans <aubin.constans@microchip.com>
 +R:    Eugen Hristev <eugen.hristev@collabora.com>
  L:    linux-mmc@vger.kernel.org
  S:    Supported
  F:    drivers/mmc/host/sdhci-of-at91.c
@@@ -19597,7 -19436,6 +19606,7 @@@ F:   drivers/net/ethernet/sfc
  
  SFCTEMP HWMON DRIVER
  M:    Emil Renner Berthing <kernel@esmil.dk>
 +M:    Hal Feng <hal.feng@starfivetech.com>
  L:    linux-hwmon@vger.kernel.org
  S:    Maintained
  F:    Documentation/devicetree/bindings/hwmon/starfive,jh71x0-temp.yaml
@@@ -20198,15 -20036,19 +20207,15 @@@ T:        git git://linuxtv.org/media_tree.gi
  F:    drivers/media/i2c/imx319.c
  
  SONY IMX334 SENSOR DRIVER
 -M:    Paul J. Murphy <paul.j.murphy@intel.com>
 -M:    Daniele Alessandrelli <daniele.alessandrelli@intel.com>
  L:    linux-media@vger.kernel.org
 -S:    Maintained
 +S:    Orphan
  T:    git git://linuxtv.org/media_tree.git
  F:    Documentation/devicetree/bindings/media/i2c/sony,imx334.yaml
  F:    drivers/media/i2c/imx334.c
  
  SONY IMX335 SENSOR DRIVER
 -M:    Paul J. Murphy <paul.j.murphy@intel.com>
 -M:    Daniele Alessandrelli <daniele.alessandrelli@intel.com>
  L:    linux-media@vger.kernel.org
 -S:    Maintained
 +S:    Orphan
  T:    git git://linuxtv.org/media_tree.git
  F:    Documentation/devicetree/bindings/media/i2c/sony,imx335.yaml
  F:    drivers/media/i2c/imx335.c
@@@ -20219,8 -20061,10 +20228,8 @@@ T:  git git://linuxtv.org/media_tree.gi
  F:    drivers/media/i2c/imx355.c
  
  SONY IMX412 SENSOR DRIVER
 -M:    Paul J. Murphy <paul.j.murphy@intel.com>
 -M:    Daniele Alessandrelli <daniele.alessandrelli@intel.com>
  L:    linux-media@vger.kernel.org
 -S:    Maintained
 +S:    Orphan
  T:    git git://linuxtv.org/media_tree.git
  F:    Documentation/devicetree/bindings/media/i2c/sony,imx412.yaml
  F:    drivers/media/i2c/imx412.c
@@@ -20253,17 -20097,10 +20262,17 @@@ F:        drivers/char/sonypi.
  F:    drivers/platform/x86/sony-laptop.c
  F:    include/linux/sony-laptop.h
  
 +SOPHGO DEVICETREES
 +M:    Chao Wei <chao.wei@sophgo.com>
 +M:    Chen Wang <unicorn_wang@outlook.com>
 +S:    Maintained
 +F:    arch/riscv/boot/dts/sophgo/
 +F:    Documentation/devicetree/bindings/riscv/sophgo.yaml
 +
  SOUND
  M:    Jaroslav Kysela <perex@perex.cz>
  M:    Takashi Iwai <tiwai@suse.com>
 -L:    alsa-devel@alsa-project.org (moderated for non-subscribers)
 +L:    linux-sound@vger.kernel.org
  S:    Maintained
  W:    http://www.alsa-project.org/
  Q:    http://patchwork.kernel.org/project/alsa-devel/list/
@@@ -20276,7 -20113,7 +20285,7 @@@ F:   tools/testing/selftests/als
  
  SOUND - ALSA SELFTESTS
  M:    Mark Brown <broonie@kernel.org>
 -L:    alsa-devel@alsa-project.org (moderated for non-subscribers)
 +L:    linux-sound@vger.kernel.org
  L:    linux-kselftest@vger.kernel.org
  S:    Supported
  F:    tools/testing/selftests/alsa
@@@ -20302,7 -20139,7 +20311,7 @@@ F:   sound/soc/soc-generic-dmaengine-pcm.
  SOUND - SOC LAYER / DYNAMIC AUDIO POWER MANAGEMENT (ASoC)
  M:    Liam Girdwood <lgirdwood@gmail.com>
  M:    Mark Brown <broonie@kernel.org>
 -L:    alsa-devel@alsa-project.org (moderated for non-subscribers)
 +L:    linux-sound@vger.kernel.org
  S:    Supported
  W:    http://alsa-project.org/main/index.php/ASoC
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git
@@@ -20310,10 -20147,6 +20319,10 @@@ F: Documentation/devicetree/bindings/so
  F:    Documentation/sound/soc/
  F:    include/dt-bindings/sound/
  F:    include/sound/soc*
 +F:    include/sound/sof.h
 +F:    include/sound/sof/
 +F:    include/trace/events/sof*.h
 +F:    include/uapi/sound/asoc.h
  F:    sound/soc/
  
  SOUND - SOUND OPEN FIRMWARE (SOF) DRIVERS
@@@ -20667,13 -20500,6 +20676,13 @@@ S: Supporte
  F:    Documentation/devicetree/bindings/clock/starfive,jh7110-pll.yaml
  F:    drivers/clk/starfive/clk-starfive-jh7110-pll.c
  
 +STARFIVE JH7110 PWMDAC DRIVER
 +M:    Hal Feng <hal.feng@starfivetech.com>
 +M:    Xingyu Wu <xingyu.wu@starfivetech.com>
 +S:    Supported
 +F:    Documentation/devicetree/bindings/sound/starfive,jh7110-pwmdac.yaml
 +F:    sound/soc/starfive/jh7110_pwmdac.c
 +
  STARFIVE JH7110 SYSCON
  M:    William Qiu <william.qiu@starfivetech.com>
  M:    Xingyu Wu <xingyu.wu@starfivetech.com>
@@@ -20721,10 -20547,9 +20730,10 @@@ F: drivers/usb/cdns3/cdns3-starfive.
  
  STARFIVE JH71XX PMU CONTROLLER DRIVER
  M:    Walker Chen <walker.chen@starfivetech.com>
 +M:    Changhuang Liang <changhuang.liang@starfivetech.com>
  S:    Supported
  F:    Documentation/devicetree/bindings/power/starfive*
 -F:    drivers/pmdomain/starfive/jh71xx-pmu.c
 +F:    drivers/pmdomain/starfive/
  F:    include/dt-bindings/power/starfive,jh7110-pmu.h
  
  STARFIVE SOC DRIVERS
@@@ -20732,6 -20557,7 +20741,6 @@@ M:   Conor Dooley <conor@kernel.org
  S:    Maintained
  T:    git https://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git/
  F:    Documentation/devicetree/bindings/soc/starfive/
 -F:    drivers/soc/starfive/
  
  STARFIVE TRNG DRIVER
  M:    Jia Jie Ho <jiajie.ho@starfivetech.com>
@@@ -21112,7 -20938,6 +21121,7 @@@ F:   drivers/clk/clk-sc[mp]i.
  F:    drivers/cpufreq/sc[mp]i-cpufreq.c
  F:    drivers/firmware/arm_scmi/
  F:    drivers/firmware/arm_scpi.c
 +F:    drivers/pmdomain/arm/
  F:    drivers/powercap/arm_scmi_powercap.c
  F:    drivers/regulator/scmi-regulator.c
  F:    drivers/reset/reset-scmi.c
@@@ -21572,8 -21397,8 +21581,8 @@@ F:   drivers/media/radio/radio-raremono.
  THERMAL
  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>
 +R:    Lukasz Luba <lukasz.luba@arm.com>
  L:    linux-pm@vger.kernel.org
  S:    Supported
  Q:    https://patchwork.kernel.org/project/linux-pm/list/
@@@ -21784,13 -21609,6 +21793,13 @@@ F: Documentation/devicetree/bindings/me
  F:    drivers/media/i2c/ds90*
  F:    include/media/i2c/ds90*
  
 +TI J721E CSI2RX DRIVER
 +M:    Jai Luthra <j-luthra@ti.com>
 +L:    linux-media@vger.kernel.org
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/media/ti,j721e-csi2rx-shim.yaml
 +F:    drivers/media/platform/ti/j721e-csi2rx/
 +
  TI KEYSTONE MULTICORE NAVIGATOR DRIVERS
  M:    Nishanth Menon <nm@ti.com>
  M:    Santosh Shilimkar <ssantosh@kernel.org>
@@@ -22047,11 -21865,9 +22056,11 @@@ W: https://www.tq-group.com/en/products
  F:    arch/arm/boot/dts/imx*mba*.dts*
  F:    arch/arm/boot/dts/imx*tqma*.dts*
  F:    arch/arm/boot/dts/mba*.dtsi
 +F:    arch/arm64/boot/dts/freescale/fsl-*tqml*.dts*
  F:    arch/arm64/boot/dts/freescale/imx*mba*.dts*
  F:    arch/arm64/boot/dts/freescale/imx*tqma*.dts*
  F:    arch/arm64/boot/dts/freescale/mba*.dtsi
 +F:    arch/arm64/boot/dts/freescale/tqml*.dts*
  F:    drivers/gpio/gpio-tqmx86.c
  F:    drivers/mfd/tqmx86.c
  F:    drivers/watchdog/tqmx86_wdt.c
@@@ -22107,14 -21923,6 +22116,14 @@@ W: https://github.com/srcres258/linux-d
  T:    git git://github.com/srcres258/linux-doc.git doc-zh-tw
  F:    Documentation/translations/zh_TW/
  
 +TRUSTED SECURITY MODULE (TSM) ATTESTATION REPORTS
 +M:    Dan Williams <dan.j.williams@intel.com>
 +L:    linux-coco@lists.linux.dev
 +S:    Maintained
 +F:    Documentation/ABI/testing/configfs-tsm
 +F:    drivers/virt/coco/tsm.c
 +F:    include/linux/tsm.h
 +
  TTY LAYER AND SERIAL DRIVERS
  M:    Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  M:    Jiri Slaby <jirislaby@kernel.org>
@@@ -23163,7 -22971,7 +23172,7 @@@ F:   fs/vboxsf/
  
  VIRTUAL PCM TEST DRIVER
  M:    Ivan Orlov <ivan.orlov0322@gmail.com>
 -L:    alsa-devel@alsa-project.org
 +L:    linux-sound@vger.kernel.org
  S:    Maintained
  F:    Documentation/sound/cards/pcmtest.rst
  F:    sound/drivers/pcmtest.c
@@@ -23266,7 -23074,7 +23275,7 @@@ F:   drivers/scsi/vmw_pvscsi.
  F:    drivers/scsi/vmw_pvscsi.h
  
  VMWARE VIRTUAL PTP CLOCK DRIVER
 -M:    Deep Shah <sdeep@vmware.com>
 +M:    Jeff Sipek <jsipek@vmware.com>
  R:    Ajay Kaher <akaher@vmware.com>
  R:    Alexey Makhalov <amakhalov@vmware.com>
  R:    VMware PV-Drivers Reviewers <pv-drivers@vmware.com>
@@@ -23913,11 -23721,6 +23922,11 @@@ F: Documentation/devicetree/bindings/gp
  F:    drivers/gpio/gpio-xilinx.c
  F:    drivers/gpio/gpio-zynq.c
  
 +XILINX LL TEMAC ETHERNET DRIVER
 +L:    netdev@vger.kernel.org
 +S:    Orphan
 +F:    drivers/net/ethernet/xilinx/ll_temac*
 +
  XILINX PWM DRIVER
  M:    Sean Anderson <sean.anderson@seco.com>
  S:    Maintained
@@@ -23950,13 -23753,6 +23959,13 @@@ F: Documentation/devicetree/bindings/me
  F:    drivers/media/platform/xilinx/
  F:    include/uapi/linux/xilinx-v4l2-controls.h
  
 +XILINX VERSAL EDAC DRIVER
 +M:    Shubhrajyoti Datta <shubhrajyoti.datta@amd.com>
 +M:    Sai Krishna Potthuri <sai.krishna.potthuri@amd.com>
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/memory-controllers/xlnx,versal-ddrmc-edac.yaml
 +F:    drivers/edac/versal_edac.c
 +
  XILINX WATCHDOG DRIVER
  M:    Srinivas Neeli <srinivas.neeli@amd.com>
  R:    Shubhrajyoti Datta <shubhrajyoti.datta@amd.com>
index 1eccad4ce2434b17d60daf7a284a92a74356a876,23448359838b980a5d66bbcff6ccf5570c4b9edc..41fbc4fd0fac303176d7ecb386f81d8af8cac2c6
@@@ -425,6 -425,32 +425,32 @@@ validate_fail
        return ret;
  }
  
+ static int amdgpu_amdkfd_bo_validate_and_fence(struct amdgpu_bo *bo,
+                                              uint32_t domain,
+                                              struct dma_fence *fence)
+ {
+       int ret = amdgpu_bo_reserve(bo, false);
+       if (ret)
+               return ret;
+       ret = amdgpu_amdkfd_bo_validate(bo, domain, true);
+       if (ret)
+               goto unreserve_out;
+       ret = dma_resv_reserve_fences(bo->tbo.base.resv, 1);
+       if (ret)
+               goto unreserve_out;
+       dma_resv_add_fence(bo->tbo.base.resv, fence,
+                          DMA_RESV_USAGE_BOOKKEEP);
+ unreserve_out:
+       amdgpu_bo_unreserve(bo);
+       return ret;
+ }
  static int amdgpu_amdkfd_validate_vm_bo(void *_unused, struct amdgpu_bo *bo)
  {
        return amdgpu_amdkfd_bo_validate(bo, bo->allowed_domains, false);
@@@ -1118,7 -1144,7 +1144,7 @@@ static int reserve_bo_and_vm(struct kgd
                if (unlikely(ret))
                        goto error;
  
 -              ret = drm_exec_lock_obj(&ctx->exec, &bo->tbo.base);
 +              ret = drm_exec_prepare_obj(&ctx->exec, &bo->tbo.base, 1);
                drm_exec_retry_on_contention(&ctx->exec);
                if (unlikely(ret))
                        goto error;
@@@ -1784,6 -1810,15 +1810,15 @@@ int amdgpu_amdkfd_gpuvm_alloc_memory_of
                }
                bo->allowed_domains = AMDGPU_GEM_DOMAIN_GTT;
                bo->preferred_domains = AMDGPU_GEM_DOMAIN_GTT;
+       } else {
+               mutex_lock(&avm->process_info->lock);
+               if (avm->process_info->eviction_fence &&
+                   !dma_fence_is_signaled(&avm->process_info->eviction_fence->base))
+                       ret = amdgpu_amdkfd_bo_validate_and_fence(bo, domain,
+                               &avm->process_info->eviction_fence->base);
+               mutex_unlock(&avm->process_info->lock);
+               if (ret)
+                       goto err_validate_bo;
        }
  
        if (offset)
  
  allocate_init_user_pages_failed:
  err_pin_bo:
+ err_validate_bo:
        remove_kgd_mem_from_kfd_bo_list(*mem, avm->process_info);
        drm_vma_node_revoke(&gobj->vma_node, drm_priv);
  err_node_allow:
@@@ -1866,10 -1902,6 +1902,6 @@@ int amdgpu_amdkfd_gpuvm_free_memory_of_
        if (unlikely(ret))
                return ret;
  
-       /* The eviction fence should be removed by the last unmap.
-        * TODO: Log an error condition if the bo still has the eviction fence
-        * attached
-        */
        amdgpu_amdkfd_remove_eviction_fence(mem->bo,
                                        process_info->eviction_fence);
        pr_debug("Release VA 0x%llx - 0x%llx\n", mem->va,
@@@ -1998,19 -2030,6 +2030,6 @@@ int amdgpu_amdkfd_gpuvm_map_memory_to_g
        if (unlikely(ret))
                goto out_unreserve;
  
-       if (mem->mapped_to_gpu_memory == 0 &&
-           !amdgpu_ttm_tt_get_usermm(bo->tbo.ttm)) {
-               /* Validate BO only once. The eviction fence gets added to BO
-                * the first time it is mapped. Validate will wait for all
-                * background evictions to complete.
-                */
-               ret = amdgpu_amdkfd_bo_validate(bo, domain, true);
-               if (ret) {
-                       pr_debug("Validate failed\n");
-                       goto out_unreserve;
-               }
-       }
        list_for_each_entry(entry, &mem->attachments, list) {
                if (entry->bo_va->base.vm != avm || entry->is_mapped)
                        continue;
                         mem->mapped_to_gpu_memory);
        }
  
-       if (!amdgpu_ttm_tt_get_usermm(bo->tbo.ttm) && !bo->tbo.pin_count)
-               dma_resv_add_fence(bo->tbo.base.resv,
-                                  &avm->process_info->eviction_fence->base,
-                                  DMA_RESV_USAGE_BOOKKEEP);
        ret = unreserve_bo_and_vms(&ctx, false, false);
  
        goto out;
@@@ -2074,7 -2089,6 +2089,6 @@@ int amdgpu_amdkfd_gpuvm_unmap_memory_fr
                struct amdgpu_device *adev, struct kgd_mem *mem, void *drm_priv)
  {
        struct amdgpu_vm *avm = drm_priv_to_vm(drm_priv);
-       struct amdkfd_process_info *process_info = avm->process_info;
        unsigned long bo_size = mem->bo->tbo.base.size;
        struct kfd_mem_attachment *entry;
        struct bo_vm_reservation_context ctx;
                         mem->mapped_to_gpu_memory);
        }
  
-       /* If BO is unmapped from all VMs, unfence it. It can be evicted if
-        * required.
-        */
-       if (mem->mapped_to_gpu_memory == 0 &&
-           !amdgpu_ttm_tt_get_usermm(mem->bo->tbo.ttm) &&
-           !mem->bo->tbo.pin_count)
-               amdgpu_amdkfd_remove_eviction_fence(mem->bo,
-                                               process_info->eviction_fence);
  unreserve_out:
        unreserve_bo_and_vms(&ctx, false, false);
  out:
@@@ -2351,8 -2356,20 +2356,20 @@@ int amdgpu_amdkfd_gpuvm_import_dmabuf(s
        amdgpu_sync_create(&(*mem)->sync);
        (*mem)->is_imported = true;
  
+       mutex_lock(&avm->process_info->lock);
+       if (avm->process_info->eviction_fence &&
+           !dma_fence_is_signaled(&avm->process_info->eviction_fence->base))
+               ret = amdgpu_amdkfd_bo_validate_and_fence(bo, (*mem)->domain,
+                               &avm->process_info->eviction_fence->base);
+       mutex_unlock(&avm->process_info->lock);
+       if (ret)
+               goto err_remove_mem;
        return 0;
  
+ err_remove_mem:
+       remove_kgd_mem_from_kfd_bo_list(*mem, avm->process_info);
+       drm_vma_node_revoke(&obj->vma_node, drm_priv);
  err_free_mem:
        kfree(*mem);
  err_put_obj:
index 5bbb23e102ba0fec448ad73c382965e788ed8cbd,f3a09ecb76992b49665e5af3c8269ad14b667949..618e469e36222be2af443951e95555d6e2dfb92f
@@@ -29,6 -29,7 +29,7 @@@
  #include "amdgpu.h"
  #include "atom.h"
  
+ #include <linux/device.h>
  #include <linux/pci.h>
  #include <linux/slab.h>
  #include <linux/acpi.h>
@@@ -286,12 -287,12 +287,16 @@@ static bool amdgpu_atrm_get_bios(struc
        /* ATRM is for the discrete card only */
        if (adev->flags & AMD_IS_APU)
                return false;
+       /* ATRM is for on-platform devices only */
+       if (dev_is_removable(&adev->pdev->dev))
+               return false;
  
 -      while ((pdev = pci_get_class(PCI_CLASS_DISPLAY_VGA << 8, pdev)) != NULL) {
 +      while ((pdev = pci_get_base_class(PCI_BASE_CLASS_DISPLAY, pdev))) {
 +              if ((pdev->class != PCI_CLASS_DISPLAY_VGA << 8) &&
 +                  (pdev->class != PCI_CLASS_DISPLAY_OTHER << 8))
 +                      continue;
 +
                dhandle = ACPI_HANDLE(&pdev->dev);
                if (!dhandle)
                        continue;
                }
        }
  
 -      if (!found) {
 -              while ((pdev = pci_get_class(PCI_CLASS_DISPLAY_OTHER << 8, pdev)) != NULL) {
 -                      dhandle = ACPI_HANDLE(&pdev->dev);
 -                      if (!dhandle)
 -                              continue;
 -
 -                      status = acpi_get_handle(dhandle, "ATRM", &atrm_handle);
 -                      if (ACPI_SUCCESS(status)) {
 -                              found = true;
 -                              break;
 -                      }
 -              }
 -      }
 -
        if (!found)
                return false;
        pci_dev_put(pdev);
index e210fe5c22a04814ed3c09e0c7c13ce43772db61,0245de81cabdd0e911e662ee19d1dd2ba063cb49..86f88512eb7e19b66199514a64539bb0edc61c99
@@@ -65,8 -65,7 +65,8 @@@ static int amdgpu_cs_parser_init(struc
        }
  
        amdgpu_sync_create(&p->sync);
 -      drm_exec_init(&p->exec, DRM_EXEC_INTERRUPTIBLE_WAIT);
 +      drm_exec_init(&p->exec, DRM_EXEC_INTERRUPTIBLE_WAIT |
 +                    DRM_EXEC_IGNORE_DUPLICATES);
        return 0;
  }
  
@@@ -1117,6 -1116,11 +1117,11 @@@ static int amdgpu_cs_vm_handling(struc
                        return r;
        }
  
+       /* FIXME: In theory this loop shouldn't be needed any more when
+        * amdgpu_vm_handle_moved handles all moved BOs that are reserved
+        * with p->ticket. But removing it caused test regressions, so I'm
+        * leaving it here for now.
+        */
        amdgpu_bo_list_for_each_entry(e, p->bo_list) {
                bo_va = e->bo_va;
                if (bo_va == NULL)
                        return r;
        }
  
-       r = amdgpu_vm_handle_moved(adev, vm);
+       r = amdgpu_vm_handle_moved(adev, vm, &p->exec.ticket);
        if (r)
                return r;
  
index c1e10f42db289b7a2d3eb5d08613e009bfde4a22,dc7c8312e8c746fc89da977bb9b908887b3ce0dc..057284bf50bbea43c819daa6a8d9f14b85ab7abe
@@@ -1602,10 -1602,13 +1602,13 @@@ static int fill_in_l2_l3_pcache(struct 
        unsigned int cu_sibling_map_mask;
        int first_active_cu;
        int i, j, k, xcc, start, end;
+       int num_xcc = NUM_XCC(knode->xcc_mask);
        struct kfd_cache_properties *pcache = NULL;
+       enum amdgpu_memory_partition mode;
+       struct amdgpu_device *adev = knode->adev;
  
        start = ffs(knode->xcc_mask) - 1;
-       end = start + NUM_XCC(knode->xcc_mask);
+       end = start + num_xcc;
        cu_sibling_map_mask = cu_info->bitmap[start][0][0];
        cu_sibling_map_mask &=
                ((1 << pcache_info[cache_type].num_cu_shared) - 1);
                pcache->processor_id_low = cu_processor_id
                                        + (first_active_cu - 1);
                pcache->cache_level = pcache_info[cache_type].cache_level;
-               pcache->cache_size = pcache_info[cache_type].cache_size;
+               if (KFD_GC_VERSION(knode) == IP_VERSION(9, 4, 3))
+                       mode = adev->gmc.gmc_funcs->query_mem_partition_mode(adev);
+               else
+                       mode = UNKNOWN_MEMORY_PARTITION_MODE;
+               if (pcache->cache_level == 2)
+                       pcache->cache_size = pcache_info[cache_type].cache_size * num_xcc;
+               else if (mode)
+                       pcache->cache_size = pcache_info[cache_type].cache_size / mode;
+               else
+                       pcache->cache_size = pcache_info[cache_type].cache_size;
  
                if (pcache_info[cache_type].flags & CRAT_CACHE_FLAGS_DATA_CACHE)
                        pcache->cache_type |= HSA_CACHE_TYPE_DATA;
@@@ -2214,7 -2228,7 +2228,7 @@@ static int kfd_cpumask_to_apic_id(cons
        if (first_cpu_of_numa_node >= nr_cpu_ids)
                return -1;
  #ifdef CONFIG_X86_64
 -      return cpu_data(first_cpu_of_numa_node).apicid;
 +      return cpu_data(first_cpu_of_numa_node).topo.apicid;
  #else
        return first_cpu_of_numa_node;
  #endif