Merge tag 'media/v6.12-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab...

Pull media updates from Mauro Carvalho Chehab:

 - New CEC driver: Extron DA HD 4K Plus

 - Lots of driver fixes, cleanups and improvements

* tag 'media/v6.12-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (179 commits)
  media: atomisp: Use clamp() in ia_css_eed1_8_vmem_encode()
  media: atomisp: Fix eed1_8 code assigning signed values to an unsigned variable
  media: atomisp: set lock before calling vb2_queue_init()
  media: atomisp: Improve binary finding debug logging
  media: atomisp: Drop dev_dbg() calls from hmm_[alloc|free]()
  media: atomisp: csi2-bridge: Add DMI quirk for t4ka3 on Xiaomi Mipad2
  media: atomisp: add missing wait_prepare/finish ops
  media: atomisp: Remove unused declaration
  media: atomisp: use clamp() in compute_coring()
  media: atomisp: use clamp() in ia_css_eed1_8_encode()
  media: atomisp: Simplify ia_css_pipe_create_cas_scaler_desc_single_output()
  media: atomisp: Replace rarely used macro from math_support.h
  media: atomisp: Remove duplicated leftover, i.e. sh_css_dvs_info.h
  media: atomisp: bnr: fix trailing statement
  media: atomisp: move trailing */ to separate lines
  media: atomisp: move trailing statement to next line.
  media: atomisp: Fix trailing statement in ia_css_de.host.c
  media: atomisp: Fix spelling mistakes in atomisp.h
  media: atomisp: Fix spelling mistakes in atomisp_platform.h
  media: atomisp: Fix spelling mistake in csi_rx_public.h
  ...

diff --combined Documentation/admin-guide/media/vivid.rst
index c9d301ab46a383e0dd88056891298c16949b6b77,ac233b142a2798f64034869cca5dd7a84c209727..034ca7c77fb973088892e2e270cd7ccfd9c4d8c0
--- 1/Documentation/admin-guide/media/vivid.rst
--- 2/Documentation/admin-guide/media/vivid.rst
+++ b/Documentation/admin-guide/media/vivid.rst
@@@ -328,7 -328,7 +328,7 @@@ and an HDMI input, one input for each i
  detail below.
  
  Special attention has been given to the rate at which new frames become
 -available. The jitter will be around 1 jiffie (that depends on the HZ
 +available. The jitter will be around 1 jiffy (that depends on the HZ
  configuration of your kernel, so usually 1/100, 1/250 or 1/1000 of a second),
  but the long-term behavior is exactly following the framerate. So a
  framerate of 59.94 Hz is really different from 60 Hz. If the framerate
@@@ -1343,7 -1343,7 +1343,7 @@@ Some Future Improvement
  Just as a reminder and in no particular order:
  
  - Add a virtual alsa driver to test audio
- - Add virtual sub-devices and media controller support
+ - Add virtual sub-devices
  - Some support for testing compressed video
  - Add support to loop raw VBI output to raw VBI input
  - Add support to loop teletext sliced VBI output to VBI input
@@@ -1358,4 -1358,4 +1358,4 @@@
  - Make a thread for the RDS generation, that would help in particular for the
    "Controls" RDS Rx I/O Mode as the read-only RDS controls could be updated
    in real-time.
- - Changing the EDID should cause hotplug detect emulation to happen.
+ - Changing the EDID doesn't wait 100 ms before setting the HPD signal.

diff --combined MAINTAINERS
index a06113d8f980c3f89763f6dd3ae9d95fac948c4c,6db07b8fa2150992d3bad7434c7f390cc8104448..911d573f7779f683e1d10b84156f2829e282f97b
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -334,7 -334,6 +334,7 @@@ L: [email protected]
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
  F:    drivers/acpi/arm64
 +F:    include/linux/acpi_iort.h
  
  ACPI FOR RISC-V (ACPI/riscv)
  M:    Sunil V L <[email protected]>
@@@ -538,17 -537,6 +538,17 @@@ F:       drivers/leds/leds-adp5520.
  F:    drivers/mfd/adp5520.c
  F:    drivers/video/backlight/adp5520_bl.c
  
 +ADP5585 GPIO EXPANDER, PWM AND KEYPAD CONTROLLER DRIVER
 +M:    Laurent Pinchart <[email protected]>
 +L:    [email protected]
 +L:    [email protected]
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/*/adi,adp5585*.yaml
 +F:    drivers/gpio/gpio-adp5585.c
 +F:    drivers/mfd/adp5585.c
 +F:    drivers/pwm/pwm-adp5585.c
 +F:    include/linux/mfd/adp5585.h
 +
  ADP5588 QWERTY KEYPAD AND IO EXPANDER DRIVER (ADP5588/ADP5587)
  M:    Michael Hennerich <[email protected]>
  S:    Supported
@@@ -1025,13 -1013,6 +1025,13 @@@ S:    Supporte
  T:    git https://gitlab.freedesktop.org/agd5f/linux.git
  F:    drivers/gpu/drm/amd/display/
  
 +AMD DISPLAY CORE - DML
 +M:    Chaitanya Dhere <[email protected]>
 +M:    Jun Lei <[email protected]>
 +S:    Supported
 +F:    drivers/gpu/drm/amd/display/dc/dml/
 +F:    drivers/gpu/drm/amd/display/dc/dml2/
 +
  AMD FAM15H PROCESSOR POWER MONITORING DRIVER
  M:    Huang Rui <[email protected]>
  L:    [email protected]
@@@ -1147,14 -1128,6 +1147,14 @@@ L:    [email protected]
  S:    Maintained
  F:    drivers/dma/ptdma/
  
 +AMD QDMA DRIVER
 +M:    Nishad Saraf <[email protected]>
 +M:    Lizhi Hou <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +F:    drivers/dma/amd/qdma/
 +F:    include/linux/platform_data/amd_qdma.h
 +
  AMD SEATTLE DEVICE TREE SUPPORT
  M:    Suravee Suthikulpanit <[email protected]>
  M:    Tom Lendacky <[email protected]>
@@@ -1180,13 -1153,6 +1180,13 @@@ S:    Supporte
  F:    arch/arm64/boot/dts/amd/amd-seattle-xgbe*.dtsi
  F:    drivers/net/ethernet/amd/xgbe/
  
 +AMLOGIC BLUETOOTH DRIVER
 +M:    Yang Li <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/net/bluetooth/amlogic,w155s2-bt.yaml
 +F:    drivers/bluetooth/hci_aml.c
 +
  AMLOGIC DDR PMU DRIVER
  M:    Jiucheng Xu <[email protected]>
  L:    [email protected]
@@@ -1236,13 -1202,6 +1236,13 @@@ W:    https://ez.analog.com/linux-software
  F:    Documentation/devicetree/bindings/iio/dac/adi,ad3552r.yaml
  F:    drivers/iio/dac/ad3552r.c
  
 +ANALOG DEVICES INC AD4000 DRIVER
 +M:    Marcelo Schmitt <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +W:    https://ez.analog.com/linux-software-drivers
 +F:    Documentation/devicetree/bindings/iio/adc/adi,ad4000.yaml
 +
  ANALOG DEVICES INC AD4130 DRIVER
  M:    Cosmin Tanislav <[email protected]>
  L:    [email protected]
@@@ -1650,14 -1609,6 +1650,14 @@@ F:    Documentation/admin-guide/perf/xgene
  F:    Documentation/devicetree/bindings/perf/apm-xgene-pmu.txt
  F:    drivers/perf/xgene_pmu.c
  
 +APPLIED MICRO QT2025 PHY DRIVER
 +M:    FUJITA Tomonori <[email protected]>
 +R:    Trevor Gross <[email protected]>
 +L:    [email protected]
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/net/phy/qt2025.rs
 +
  APTINA CAMERA SENSOR PLL
  M:    Laurent Pinchart <[email protected]>
  L:    [email protected]
@@@ -1786,17 -1737,6 +1786,17 @@@ F:    drivers/mtd/maps/physmap-versatile.
  F:    drivers/power/reset/arm-versatile-reboot.c
  F:    drivers/soc/versatile/
  
 +ARM INTERCONNECT PMU DRIVERS
 +M:    Robin Murphy <[email protected]>
 +S:    Supported
 +F:    Documentation/admin-guide/perf/arm-cmn.rst
 +F:    Documentation/admin-guide/perf/arm-ni.rst
 +F:    Documentation/devicetree/bindings/perf/arm,cmn.yaml
 +F:    Documentation/devicetree/bindings/perf/arm,ni.yaml
 +F:    drivers/perf/arm-cmn.c
 +F:    drivers/perf/arm-ni.c
 +F:    tools/perf/pmu-events/arch/arm64/arm/cmn/
 +
  ARM KOMEDA DRM-KMS DRIVER
  M:    Liviu Dudau <[email protected]>
  S:    Supported
@@@ -1814,7 -1754,6 +1814,7 @@@ L:      [email protected]
  S:    Supported
  T:    git https://gitlab.freedesktop.org/drm/misc/kernel.git
  F:    Documentation/gpu/panfrost.rst
 +F:    drivers/gpu/drm/ci/xfails/panfrost*
  F:    drivers/gpu/drm/panfrost/
  F:    include/uapi/drm/panfrost_drm.h
  
@@@ -1941,10 -1880,6 +1941,10 @@@ F:    Documentation/devicetree/bindings/io
  F:    drivers/iommu/arm/
  F:    drivers/iommu/io-pgtable-arm*
  
 +ARM SMMU SVA SUPPORT
 +R:    Jean-Philippe Brucker <[email protected]>
 +F:    drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3-sva.c
 +
  ARM SUB-ARCHITECTURES
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
@@@ -2493,28 -2428,18 +2493,28 @@@ N:   lpc18x
  
  ARM/LPC32XX SOC SUPPORT
  M:    Vladimir Zapolskiy <[email protected]>
 +M:    Piotr Wojtaszczyk <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
  T:    git git://github.com/vzapolskiy/linux-lpc32xx.git
  F:    Documentation/devicetree/bindings/i2c/nxp,pnx-i2c.yaml
  F:    arch/arm/boot/dts/nxp/lpc/lpc32*
  F:    arch/arm/mach-lpc32xx/
 +F:    drivers/dma/lpc32xx-dmamux.c
  F:    drivers/i2c/busses/i2c-pnx.c
  F:    drivers/net/ethernet/nxp/lpc_eth.c
  F:    drivers/usb/host/ohci-nxp.c
  F:    drivers/watchdog/pnx4008_wdt.c
  N:    lpc32xx
  
 +LPC32XX DMAMUX SUPPORT
 +M:    J.M.B. Downing <[email protected]>
 +M:    Piotr Wojtaszczyk <[email protected]>
 +R:    Vladimir Zapolskiy <[email protected]>
 +L:    [email protected] (moderated for non-subscribers)
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/dma/nxp,lpc3220-dmamux.yaml
 +
  ARM/Marvell Dove/MV78xx0/Orion SOC support
  M:    Andrew Lunn <[email protected]>
  M:    Sebastian Hesselbarth <[email protected]>
@@@ -2610,7 -2535,8 +2610,7 @@@ L:      [email protected]
  S:    Supported
  W:    http://www.linux4sam.org
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux.git
 -F:    arch/arm/boot/dts/microchip/at91*
 -F:    arch/arm/boot/dts/microchip/sama*
 +F:    arch/arm/boot/dts/microchip/
  F:    arch/arm/include/debug/at91.S
  F:    arch/arm/mach-at91/
  F:    drivers/memory/atmel*
@@@ -2802,7 -2728,7 +2802,7 @@@ F:      drivers/iommu/msm
  F:    drivers/mfd/ssbi.c
  F:    drivers/mmc/host/mmci_qcom*
  F:    drivers/mmc/host/sdhci-msm.c
 -F:    drivers/pci/controller/dwc/pcie-qcom.c
 +F:    drivers/pci/controller/dwc/pcie-qcom*
  F:    drivers/phy/qualcomm/
  F:    drivers/power/*/msm*
  F:    drivers/reset/reset-qcom-*
@@@ -2819,7 -2745,7 +2819,7 @@@ F:      include/linux/soc/qcom
  
  ARM/QUALCOMM SUPPORT
  M:    Bjorn Andersson <[email protected]>
 -M:    Konrad Dybcio <konrad.dybcio@linaro.org>
 +M:    Konrad Dybcio <konradybcio@kernel.org>
  L:    [email protected]
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux.git
@@@ -3578,9 -3504,7 +3578,9 @@@ S:      Maintaine
  W:    http://linux-atm.sourceforge.net
  F:    drivers/atm/
  F:    include/linux/atm*
 +F:    include/linux/sonet.h
  F:    include/uapi/linux/atm*
 +F:    include/uapi/linux/sonet.h
  
  ATMEL MACB ETHERNET DRIVER
  M:    Nicolas Ferre <[email protected]>
@@@ -3857,9 -3781,10 +3857,9 @@@ F:     Documentation/filesystems/befs.rs
  F:    fs/befs/
  
  BFQ I/O SCHEDULER
 -M:    Paolo Valente <[email protected]>
 -M:    Jens Axboe <[email protected]>
 +M:    Yu Kuai <[email protected]>
  L:    [email protected]
 -S:    Maintained
 +S:    Odd Fixes
  F:    Documentation/block/bfq-iosched.rst
  F:    block/bfq-*
  
@@@ -3938,7 -3863,7 +3938,7 @@@ F:      kernel/trace/blktrace.
  F:    lib/sbitmap.c
  
  BLOCK LAYER DEVICE DRIVER API [RUST]
 -M:    Andreas Hindborg <a.hindborg@samsung.com>
 +M:    Andreas Hindborg <a.hindborg@kernel.org>
  R:    Boqun Feng <[email protected]>
  L:    [email protected]
  L:    [email protected]
@@@ -4006,7 -3931,7 +4006,7 @@@ F:      Documentation/devicetree/bindings/ii
  F:    drivers/iio/imu/bmi323/
  
  BPF JIT for ARC
 -M:    Shahab Vahedi <[email protected]>
 +M:    Shahab Vahedi <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    arch/arc/net/
@@@ -4173,7 -4098,6 +4173,7 @@@ F:      include/uapi/linux/btf
  F:    include/uapi/linux/filter.h
  F:    kernel/bpf/
  F:    kernel/trace/bpf_trace.c
 +F:    lib/buildid.c
  F:    lib/test_bpf.c
  F:    net/bpf/
  F:    net/core/filter.c
@@@ -4294,7 -4218,6 +4294,7 @@@ L:      [email protected]
  S:    Maintained
  F:    kernel/bpf/stackmap.c
  F:    kernel/trace/bpf_trace.c
 +F:    lib/buildid.c
  
  BROADCOM ASP 2.0 ETHERNET DRIVER
  M:    Justin Chen <[email protected]>
@@@ -5173,8 -5096,10 +5173,8 @@@ F:     Documentation/devicetree/bindings/me
  F:    drivers/media/cec/platform/cec-gpio/
  
  CELL BROADBAND ENGINE ARCHITECTURE
 -M:    Arnd Bergmann <[email protected]>
  L:    [email protected]
 -S:    Supported
 -W:    http://www.ibm.com/developerworks/power/cell/
 +S:    Orphan
  F:    arch/powerpc/include/asm/cell*.h
  F:    arch/powerpc/include/asm/spu*.h
  F:    arch/powerpc/include/uapi/asm/spu*.h
@@@ -5381,7 -5306,7 +5381,7 @@@ F:      drivers/media/cec/i2c/ch7322.
  CIRRUS LOGIC AUDIO CODEC DRIVERS
  M:    David Rhodes <[email protected]>
  M:    Richard Fitzgerald <[email protected]>
 -L:    [email protected] (moderated for non-subscribers)
 +L:    [email protected]
  L:    [email protected]
  S:    Maintained
  F:    Documentation/devicetree/bindings/sound/cirrus,cs*
@@@ -5450,7 -5375,7 +5450,7 @@@ F:      sound/soc/codecs/lochnagar-sc.
  CIRRUS LOGIC MADERA CODEC DRIVERS
  M:    Charles Keepax <[email protected]>
  M:    Richard Fitzgerald <[email protected]>
 -L:    [email protected] (moderated for non-subscribers)
 +L:    [email protected]
  L:    [email protected]
  S:    Supported
  W:    https://github.com/CirrusLogic/linux-drivers/wiki
@@@ -5773,12 -5698,9 +5773,12 @@@ S:    Maintaine
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git
  F:    Documentation/admin-guide/cgroup-v1/cpusets.rst
  F:    include/linux/cpuset.h
 +F:    kernel/cgroup/cpuset-internal.h
 +F:    kernel/cgroup/cpuset-v1.c
  F:    kernel/cgroup/cpuset.c
  F:    tools/testing/selftests/cgroup/test_cpuset.c
  F:    tools/testing/selftests/cgroup/test_cpuset_prs.sh
 +F:    tools/testing/selftests/cgroup/test_cpuset_v1_base.sh
  
  CONTROL GROUP - MEMORY RESOURCE CONTROLLER (MEMCG)
  M:    Johannes Weiner <[email protected]>
@@@ -5897,9 -5819,6 +5897,9 @@@ CPU POWER MONITORING SUBSYSTE
  M:    Thomas Renninger <[email protected]>
  M:    Shuah Khan <[email protected]>
  M:    Shuah Khan <[email protected]>
 +M:    John B. Wyatt IV <[email protected]>
 +M:    John B. Wyatt IV <[email protected]>
 +M:    John Kacur <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    tools/power/cpupower/
@@@ -6032,7 -5951,6 +6032,7 @@@ F:      Documentation/process/cve.rs
  CW1200 WLAN driver
  S:    Orphan
  F:    drivers/net/wireless/st/cw1200/
 +F:    include/linux/platform_data/net-cw1200.h
  
  CX18 VIDEO4LINUX DRIVER
  M:    Andy Walls <[email protected]>
@@@ -6582,7 -6500,6 +6582,7 @@@ F:      Documentation/devicetree/bindings/re
  F:    Documentation/devicetree/bindings/regulator/dlg,da9*.yaml
  F:    Documentation/devicetree/bindings/regulator/dlg,slg51000.yaml
  F:    Documentation/devicetree/bindings/sound/da[79]*.txt
 +F:    Documentation/devicetree/bindings/sound/dlg,da7213.yaml
  F:    Documentation/devicetree/bindings/thermal/dlg,da9062-thermal.yaml
  F:    Documentation/devicetree/bindings/watchdog/dlg,da9062-watchdog.yaml
  F:    Documentation/hwmon/da90??.rst
@@@ -6743,7 -6660,6 +6743,7 @@@ F:      drivers/dma-buf/dma-heap.
  F:    drivers/dma-buf/heaps/*
  F:    include/linux/dma-heap.h
  F:    include/uapi/linux/dma-heap.h
 +F:    tools/testing/selftests/dmabuf-heaps/
  
  DMC FREQUENCY DRIVER FOR SAMSUNG EXYNOS5422
  M:    Lukasz Luba <[email protected]>
@@@ -6795,7 -6711,6 +6795,7 @@@ DOCUMENTATION PROCES
  M:    Jonathan Corbet <[email protected]>
  L:    [email protected]
  S:    Maintained
 +F:    Documentation/dev-tools/
  F:    Documentation/maintainer/
  F:    Documentation/process/
  
@@@ -6803,7 -6718,6 +6803,7 @@@ DOCUMENTATION REPORTING ISSUE
  M:    Thorsten Leemhuis <[email protected]>
  L:    [email protected]
  S:    Maintained
 +F:    Documentation/admin-guide/bug-bisect.rst
  F:    Documentation/admin-guide/quickly-build-trimmed-linux.rst
  F:    Documentation/admin-guide/reporting-issues.rst
  F:    Documentation/admin-guide/verify-bugs-and-bisect-regressions.rst
@@@ -7192,7 -7106,7 +7192,7 @@@ F:      drivers/gpu/drm/tiny/panel-mipi-dbi.
  DRM DRIVER for Qualcomm Adreno GPUs
  M:    Rob Clark <[email protected]>
  R:    Sean Paul <[email protected]>
 -R:    Konrad Dybcio <konrad.dybcio@linaro.org>
 +R:    Konrad Dybcio <konradybcio@kernel.org>
  L:    [email protected]
  L:    [email protected]
  L:    [email protected]
@@@ -7418,10 -7332,10 +7418,10 @@@ F:   drivers/gpu/drm/udl
  
  DRM DRIVER FOR VIRTUAL KERNEL MODESETTING (VKMS)
  M:    Rodrigo Siqueira <[email protected]>
 -M:    Melissa Wen <[email protected]>
  M:    Maíra Canal <[email protected]>
  R:    Haneen Mohammed <[email protected]>
 -R:    Daniel Vetter <[email protected]>
 +R:    Simona Vetter <[email protected]>
 +R:    Melissa Wen <[email protected]>
  L:    [email protected]
  S:    Maintained
  T:    git https://gitlab.freedesktop.org/drm/misc/kernel.git
@@@ -7454,7 -7368,7 +7454,7 @@@ F:      drivers/gpu/drm/panel/panel-widechip
  
  DRM DRIVERS
  M:    David Airlie <[email protected]>
 -M:    Daniel Vetter <daniel@ffwll.ch>
 +M:    Simona Vetter <simona@ffwll.ch>
  L:    [email protected]
  S:    Maintained
  B:    https://gitlab.freedesktop.org/drm
@@@ -7538,8 -7452,8 +7538,8 @@@ S:      Maintaine
  T:    git https://gitlab.freedesktop.org/drm/misc/kernel.git
  F:    Documentation/devicetree/bindings/display/bridge/
  F:    drivers/gpu/drm/bridge/
 +F:    drivers/gpu/drm/display/drm_bridge_connector.c
  F:    drivers/gpu/drm/drm_bridge.c
 -F:    drivers/gpu/drm/drm_bridge_connector.c
  F:    include/drm/drm_bridge.h
  F:    include/drm/drm_bridge_connector.h
  
@@@ -7550,6 -7464,7 +7550,6 @@@ M:      Kyungmin Park <kyungmin.park@samsung
  L:    [email protected]
  S:    Supported
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos.git
 -F:    Documentation/devicetree/bindings/display/exynos/
  F:    Documentation/devicetree/bindings/display/samsung/
  F:    drivers/gpu/drm/exynos/
  F:    include/uapi/drm/exynos_drm.h
@@@ -8424,7 -8339,6 +8424,7 @@@ F:      include/linux/mii.
  F:    include/linux/of_net.h
  F:    include/linux/phy.h
  F:    include/linux/phy_fixed.h
 +F:    include/linux/phy_link_topology.h
  F:    include/linux/phylib_stubs.h
  F:    include/linux/platform_data/mdio-bcm-unimac.h
  F:    include/linux/platform_data/mdio-gpio.h
@@@ -8440,7 -8354,6 +8440,7 @@@ L:      [email protected]
  L:    [email protected]
  S:    Maintained
  F:    rust/kernel/net/phy.rs
 +F:    rust/kernel/net/phy/reg.rs
  
  EXEC & BINFMT API, ELF
  R:    Eric Biederman <[email protected]>
@@@ -8548,6 -8461,13 +8548,13 @@@ F:    lib/bootconfig.
  F:    tools/bootconfig/*
  F:    tools/bootconfig/scripts/*
  
+ EXTRON DA HD 4K PLUS CEC DRIVER
+ M:    Hans Verkuil <[email protected]>
+ L:    [email protected]
+ S:    Maintained
+ T:    git git://linuxtv.org/media_tree.git
+ F:    drivers/media/cec/usb/extron-da-hd-4k-plus/
+ 
  EXYNOS DP DRIVER
  M:    Jingoo Han <[email protected]>
  L:    [email protected]
@@@ -8623,7 -8543,6 +8630,7 @@@ M:      Akinobu Mita <[email protected]
  S:    Supported
  F:    Documentation/fault-injection/
  F:    lib/fault-inject.c
 +F:    tools/testing/fault-injection/
  
  FBTFT Framebuffer drivers
  L:    [email protected]
@@@ -8685,7 -8604,6 +8692,7 @@@ M:      Christian Brauner <[email protected]
  R:    Jan Kara <[email protected]>
  L:    [email protected]
  S:    Maintained
 +T:    git https://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs.git
  F:    fs/*
  F:    include/linux/fs.h
  F:    include/linux/fs_types.h
@@@ -8861,6 -8779,7 +8868,6 @@@ F:      include/linux/fortify-string.
  F:    lib/fortify_kunit.c
  F:    lib/memcpy_kunit.c
  F:    lib/test_fortify/*
 -F:    scripts/test_fortify.sh
  K:    \b__NO_FORTIFY\b
  
  FPGA DFL DRIVERS
@@@ -8897,7 -8816,7 +8904,7 @@@ W:      https://floatingpoint.billm.au
  F:    arch/x86/math-emu/
  
  FRAMEBUFFER CORE
 -M:    Daniel Vetter <daniel@ffwll.ch>
 +M:    Simona Vetter <simona@ffwll.ch>
  S:    Odd Fixes
  T:    git https://gitlab.freedesktop.org/drm/misc/kernel.git
  F:    drivers/video/fbdev/core/
@@@ -8947,7 -8866,6 +8954,7 @@@ F:      drivers/dma/fsldma.
  FREESCALE DSPI DRIVER
  M:    Vladimir Oltean <[email protected]>
  L:    [email protected]
 +L:    [email protected]
  S:    Maintained
  F:    Documentation/devicetree/bindings/spi/fsl,dspi*.yaml
  F:    drivers/spi/spi-fsl-dspi.c
@@@ -9032,14 -8950,6 +9039,14 @@@ S:    Maintaine
  F:    Documentation/devicetree/bindings/i2c/i2c-imx-lpi2c.yaml
  F:    drivers/i2c/busses/i2c-imx-lpi2c.c
  
 +FREESCALE IMX LPSPI DRIVER
 +M:    Frank Li <[email protected]>
 +L:    [email protected]
 +L:    [email protected]
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/spi/spi-fsl-lpspi.yaml
 +F:    drivers/spi/spi-fsl-lpspi.c
 +
  FREESCALE MPC I2C DRIVER
  M:    Chris Packham <[email protected]>
  L:    [email protected]
@@@ -9076,7 -8986,6 +9083,7 @@@ F:      include/linux/fsl/ptp_qoriq.
  FREESCALE QUAD SPI DRIVER
  M:    Han Xu <[email protected]>
  L:    [email protected]
 +L:    [email protected]
  S:    Maintained
  F:    Documentation/devicetree/bindings/spi/fsl,spi-fsl-qspi.yaml
  F:    drivers/spi/spi-fsl-qspi.c
@@@ -9094,7 -9003,6 +9101,7 @@@ M:      Herve Codina <[email protected]
  L:    [email protected]
  S:    Maintained
  F:    Documentation/devicetree/bindings/soc/fsl/cpm_qe/fsl,cpm1-scc-qmc.yaml
 +F:    Documentation/devicetree/bindings/soc/fsl/cpm_qe/fsl,qe-ucc-qmc.yaml
  F:    drivers/soc/fsl/qe/qmc.c
  F:    include/soc/fsl/qe/qmc.h
  
@@@ -9110,11 -9018,9 +9117,11 @@@ M:    Herve Codina <[email protected]
  L:    [email protected]
  S:    Maintained
  F:    Documentation/devicetree/bindings/soc/fsl/cpm_qe/fsl,cpm1-tsa.yaml
 +F:    Documentation/devicetree/bindings/soc/fsl/cpm_qe/fsl,qe-tsa.yaml
  F:    drivers/soc/fsl/qe/tsa.c
  F:    drivers/soc/fsl/qe/tsa.h
  F:    include/dt-bindings/soc/cpm1-fsl,tsa.h
 +F:    include/dt-bindings/soc/qe-fsl,tsa.h
  
  FREESCALE QUICC ENGINE UCC ETHERNET DRIVER
  L:    [email protected]
@@@ -10274,7 -10180,7 +10281,7 @@@ F:   Documentation/devicetree/bindings/in
  F:    drivers/infiniband/hw/hns/
  
  HISILICON SAS Controller
 -M:    Xiang Chen <chenxiang66@hisilicon.com>
 +M:    Yihang Li <liyihang9@huawei.com>
  S:    Supported
  W:    http://www.hisilicon.com
  F:    Documentation/devicetree/bindings/scsi/hisilicon-sas.txt
@@@ -11064,7 -10970,6 +11071,7 @@@ T:   git https://gitlab.freedesktop.org/d
  F:    Documentation/devicetree/bindings/gpu/img,powervr-rogue.yaml
  F:    Documentation/devicetree/bindings/gpu/img,powervr-sgx.yaml
  F:    Documentation/gpu/imagination/
 +F:    drivers/gpu/drm/ci/xfails/powervr*
  F:    drivers/gpu/drm/imagination/
  F:    include/uapi/drm/pvr_drm.h
  
@@@ -11220,16 -11125,6 +11227,16 @@@ T: git git://git.kernel.org/pub/scm/lin
  F:    security/integrity/
  F:    security/integrity/ima/
  
 +INTEGRITY POLICY ENFORCEMENT (IPE)
 +M:    Fan Wu <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +T:    git https://github.com/microsoft/ipe.git
 +F:    Documentation/admin-guide/LSM/ipe.rst
 +F:    Documentation/security/ipe.rst
 +F:    scripts/ipe/
 +F:    security/ipe/
 +
  INTEL 810/815 FRAMEBUFFER DRIVER
  M:    Antonino Daplas <[email protected]>
  L:    [email protected]
@@@ -11252,12 -11147,12 +11259,12 @@@ F:        drivers/gpio/gpio-i8255.
  
  INTEL ASoC DRIVERS
  M:    Cezary Rojewski <[email protected]>
 -M:    Pierre-Louis Bossart <[email protected]>
  M:    Liam Girdwood <[email protected]>
  M:    Peter Ujfalusi <[email protected]>
  M:    Bard Liao <[email protected]>
  M:    Ranjani Sridharan <[email protected]>
  M:    Kai Vehmanen <[email protected]>
 +R:    Pierre-Louis Bossart <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  S:    Supported
  F:    sound/soc/intel/
@@@ -11573,24 -11468,6 +11580,24 @@@ S: Maintaine
  F:    Documentation/ABI/testing/sysfs-driver-intel-m10-bmc-sec-update
  F:    drivers/fpga/intel-m10-bmc-sec-update.c
  
 +INTEL MID (Mobile Internet Device) PLATFORM
 +M:    Andy Shevchenko <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +F:    arch/x86/include/asm/intel-mid.h
 +F:    arch/x86/pci/intel_mid_pci.c
 +F:    arch/x86/platform/intel-mid/
 +F:    drivers/extcon/extcon-intel-mrfld.c
 +F:    drivers/iio/adc/intel_mrfld_adc.c
 +F:    drivers/mfd/intel_soc_pmic_mrfld.c
 +F:    drivers/platform/x86/intel/mrfld_pwrbtn.c
 +F:    drivers/platform/x86/intel_scu_*
 +F:    drivers/staging/media/atomisp/
 +F:    drivers/watchdog/intel-mid_wdt.c
 +F:    include/linux/mfd/intel_soc_pmic_mrfld.h
 +F:    include/linux/platform_data/x86/intel-mid_wdt.h
 +F:    include/linux/platform_data/x86/intel_scu_ipc.h
 +
  INTEL P-Unit IPC DRIVER
  M:    Zha Qipeng <[email protected]>
  L:    [email protected]
@@@ -11653,8 -11530,8 +11660,8 @@@ F:   drivers/counter/intel-qep.
  INTEL SCU DRIVERS
  M:    Mika Westerberg <[email protected]>
  S:    Maintained
 -F:    arch/x86/include/asm/intel_scu_ipc.h
  F:    drivers/platform/x86/intel_scu_*
 +F:    include/linux/platform_data/x86/intel_scu_ipc.h
  
  INTEL SDSI DRIVER
  M:    David E. Box <[email protected]>
@@@ -11729,8 -11606,7 +11736,8 @@@ F:   drivers/platform/x86/intel/uncore-fr
  INTEL VENDOR SPECIFIC EXTENDED CAPABILITIES DRIVER
  M:    David E. Box <[email protected]>
  S:    Supported
 -F:    drivers/platform/x86/intel/vsec.*
 +F:    drivers/platform/x86/intel/vsec.c
 +F:    include/linux/intel_vsec.h
  
  INTEL VIRTUAL BUTTON DRIVER
  M:    AceLan Kao <[email protected]>
@@@ -11853,7 -11729,6 +11860,7 @@@ T:   git git://git.kernel.org/pub/scm/lin
  F:    drivers/iommu/dma-iommu.c
  F:    drivers/iommu/dma-iommu.h
  F:    drivers/iommu/iova.c
 +F:    include/linux/iommu-dma.h
  F:    include/linux/iova.h
  
  IOMMU SUBSYSTEM
@@@ -12125,7 -12000,7 +12132,7 @@@ F:   fs/jfs
  JME NETWORK DRIVER
  M:    Guo-Fu Tseng <[email protected]>
  L:    [email protected]
 -S:    Maintained
 +S:    Odd Fixes
  F:    drivers/net/ethernet/jme.*
  
  JOURNALLING FLASH FILE SYSTEM V2 (JFFS2)
@@@ -12297,7 -12172,7 +12304,7 @@@ KERNEL NFSD, SUNRPC, AND LOCKD SERVER
  M:    Chuck Lever <[email protected]>
  M:    Jeff Layton <[email protected]>
  R:    Neil Brown <[email protected]>
 -R:    Olga Kornievskaia <kolga@netapp.com>
 +R:    Olga Kornievskaia <okorniev@redhat.com>
  R:    Dai Ngo <[email protected]>
  R:    Tom Talpey <[email protected]>
  L:    [email protected]
@@@ -12424,7 -12299,6 +12431,7 @@@ L:   [email protected]
  L:    [email protected]
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/virt/kvm/kvm.git
 +F:    Documentation/virt/kvm/loongarch/
  F:    arch/loongarch/include/asm/kvm*
  F:    arch/loongarch/include/uapi/asm/kvm*
  F:    arch/loongarch/kvm/
@@@ -13043,7 -12917,6 +13050,7 @@@ M:   Michael Ellerman <[email protected]
  R:    Nicholas Piggin <[email protected]>
  R:    Christophe Leroy <[email protected]>
  R:    Naveen N Rao <[email protected]>
 +R:    Madhavan Srinivasan <[email protected]>
  L:    [email protected]
  S:    Supported
  W:    https://github.com/linuxppc/wiki/wiki
@@@ -13127,7 -13000,6 +13134,7 @@@ R:   Daniel Lustig <[email protected]
  R:    Joel Fernandes <[email protected]>
  L:    [email protected]
  L:    [email protected]
 +L:    [email protected]
  S:    Supported
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git dev
  F:    Documentation/atomic_bitops.txt
@@@ -13459,16 -13331,14 +13466,16 @@@ F:        Documentation/devicetree/bindings/i2
  F:    drivers/i2c/muxes/i2c-mux-ltc4306.c
  
  LTP (Linux Test Project)
 +M:    Andrea Cervesato <[email protected]>
  M:    Cyril Hrubis <[email protected]>
  M:    Jan Stancek <[email protected]>
  M:    Petr Vorel <[email protected]>
  M:    Li Wang <[email protected]>
  M:    Yang Xu <[email protected]>
 +M:    Xiao Yang <[email protected]>
  L:    [email protected] (subscribers-only)
  S:    Maintained
 -W:    http://linux-test-project.github.io/
 +W:    https://linux-test-project.readthedocs.io/
  T:    git https://github.com/linux-test-project/ltp.git
  
  LTR390 AMBIENT/UV LIGHT SENSOR DRIVER
@@@ -13636,7 -13506,7 +13643,7 @@@ S:   Maintaine
  F:    Documentation/devicetree/bindings/mfd/marvell,88pm886-a1.yaml
  F:    drivers/input/misc/88pm886-onkey.c
  F:    drivers/mfd/88pm886.c
 -F:    drivers/regulators/88pm886-regulator.c
 +F:    drivers/regulator/88pm886-regulator.c
  F:    include/linux/mfd/88pm886.h
  
  MARVELL ARMADA 3700 PHY DRIVERS
@@@ -13676,7 -13546,7 +13683,7 @@@ MARVELL GIGABIT ETHERNET DRIVERS (skge/
  M:    Mirko Lindner <[email protected]>
  M:    Stephen Hemminger <[email protected]>
  L:    [email protected]
 -S:    Maintained
 +S:    Odd fixes
  F:    drivers/net/ethernet/marvell/sk*
  
  MARVELL LIBERTAS WIRELESS DRIVER
@@@ -13695,6 -13565,7 +13702,6 @@@ M:   Sebastian Hesselbarth <sebastian.hes
  L:    [email protected]
  S:    Maintained
  F:    drivers/net/ethernet/marvell/mv643xx_eth.*
 -F:    include/linux/mv643xx.h
  
  MARVELL MV88X3310 PHY DRIVER
  M:    Russell King <[email protected]>
@@@ -14346,8 -14217,8 +14353,8 @@@ M:   Sean Wang <[email protected]
  L:    [email protected]
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
 +F:    Documentation/devicetree/bindings/net/bluetooth/mediatek,bluetooth.txt
  F:    Documentation/devicetree/bindings/net/bluetooth/mediatek,mt7921s-bluetooth.yaml
 -F:    Documentation/devicetree/bindings/net/mediatek-bluetooth.txt
  F:    drivers/bluetooth/btmtkuart.c
  
  MEDIATEK BOARD LEVEL SHUTDOWN DRIVERS
@@@ -14625,7 -14496,7 +14632,7 @@@ MELLANOX ETHERNET DRIVER (mlx4_en
  M:    Tariq Toukan <[email protected]>
  L:    [email protected]
  S:    Supported
 -W:    http://www.mellanox.com
 +W:    https://www.nvidia.com/networking/
  Q:    https://patchwork.kernel.org/project/netdevbpf/list/
  F:    drivers/net/ethernet/mellanox/mlx4/en_*
  
@@@ -14634,7 -14505,7 +14641,7 @@@ M:   Saeed Mahameed <[email protected]
  M:    Tariq Toukan <[email protected]>
  L:    [email protected]
  S:    Supported
 -W:    http://www.mellanox.com
 +W:    https://www.nvidia.com/networking/
  Q:    https://patchwork.kernel.org/project/netdevbpf/list/
  F:    drivers/net/ethernet/mellanox/mlx5/core/en_*
  
@@@ -14642,7 -14513,7 +14649,7 @@@ MELLANOX ETHERNET INNOVA DRIVER
  R:    Boris Pismenny <[email protected]>
  L:    [email protected]
  S:    Supported
 -W:    http://www.mellanox.com
 +W:    https://www.nvidia.com/networking/
  Q:    https://patchwork.kernel.org/project/netdevbpf/list/
  F:    drivers/net/ethernet/mellanox/mlx5/core/en_accel/*
  F:    drivers/net/ethernet/mellanox/mlx5/core/fpga/*
@@@ -14653,7 -14524,7 +14660,7 @@@ M:   Ido Schimmel <[email protected]
  M:    Petr Machata <[email protected]>
  L:    [email protected]
  S:    Supported
 -W:    http://www.mellanox.com
 +W:    https://www.nvidia.com/networking/
  Q:    https://patchwork.kernel.org/project/netdevbpf/list/
  F:    drivers/net/ethernet/mellanox/mlxsw/
  F:    tools/testing/selftests/drivers/net/mlxsw/
@@@ -14662,7 -14533,7 +14669,7 @@@ MELLANOX FIRMWARE FLASH LIBRARY (mlxfw
  M:    [email protected]
  L:    [email protected]
  S:    Supported
 -W:    http://www.mellanox.com
 +W:    https://www.nvidia.com/networking/
  Q:    https://patchwork.kernel.org/project/netdevbpf/list/
  F:    drivers/net/ethernet/mellanox/mlxfw/
  
@@@ -14681,7 -14552,7 +14688,7 @@@ M:   Tariq Toukan <[email protected]
  L:    [email protected]
  L:    [email protected]
  S:    Supported
 -W:    http://www.mellanox.com
 +W:    https://www.nvidia.com/networking/
  Q:    https://patchwork.kernel.org/project/netdevbpf/list/
  F:    drivers/net/ethernet/mellanox/mlx4/
  F:    include/linux/mlx4/
@@@ -14690,7 -14561,7 +14697,7 @@@ MELLANOX MLX4 IB drive
  M:    Yishai Hadas <[email protected]>
  L:    [email protected]
  S:    Supported
 -W:    http://www.mellanox.com
 +W:    https://www.nvidia.com/networking/
  Q:    http://patchwork.kernel.org/project/linux-rdma/list/
  F:    drivers/infiniband/hw/mlx4/
  F:    include/linux/mlx4/
@@@ -14703,7 -14574,7 +14710,7 @@@ M:   Tariq Toukan <[email protected]
  L:    [email protected]
  L:    [email protected]
  S:    Supported
 -W:    http://www.mellanox.com
 +W:    https://www.nvidia.com/networking/
  Q:    https://patchwork.kernel.org/project/netdevbpf/list/
  F:    Documentation/networking/device_drivers/ethernet/mellanox/
  F:    drivers/net/ethernet/mellanox/mlx5/core/
@@@ -14713,7 -14584,7 +14720,7 @@@ MELLANOX MLX5 IB drive
  M:    Leon Romanovsky <[email protected]>
  L:    [email protected]
  S:    Supported
 -W:    http://www.mellanox.com
 +W:    https://www.nvidia.com/networking/
  Q:    http://patchwork.kernel.org/project/linux-rdma/list/
  F:    drivers/infiniband/hw/mlx5/
  F:    include/linux/mlx5/
@@@ -14941,7 -14812,6 +14948,7 @@@ M:   Alexander Duyck <[email protected]
  M:    Jakub Kicinski <[email protected]>
  R:    [email protected]
  S:    Supported
 +F:    Documentation/networking/device_drivers/ethernet/meta/
  F:    drivers/net/ethernet/meta/
  
  METHODE UDPU SUPPORT
@@@ -15088,13 -14958,6 +15095,13 @@@ L: [email protected]
  S:    Maintained
  F:    drivers/net/ethernet/microchip/lan743x_*
  
 +MICROCHIP LAN8650/1 10BASE-T1S MACPHY ETHERNET DRIVER
 +M:    Parthiban Veerasooran <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/net/microchip,lan8650.yaml
 +F:    drivers/net/ethernet/microchip/lan865x/lan865x.c
 +
  MICROCHIP LAN87xx/LAN937x T1 PHY DRIVER
  M:    Arun Ramadoss <[email protected]>
  R:    [email protected]
@@@ -15344,12 -15207,6 +15351,12 @@@ S: Maintaine
  F:    Documentation/hwmon/surface_fan.rst
  F:    drivers/hwmon/surface_fan.c
  
 +MICROSOFT SURFACE SENSOR THERMAL DRIVER
 +M:    Maximilian Luz <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/hwmon/surface_temp.c
 +
  MICROSOFT SURFACE GPE LID SUPPORT DRIVER
  M:    Maximilian Luz <[email protected]>
  L:    [email protected]
@@@ -15920,7 -15777,6 +15927,7 @@@ M:   Breno Leitao <[email protected]
  S:    Maintained
  F:    Documentation/networking/netconsole.rst
  F:    drivers/net/netconsole.c
 +F:    tools/testing/selftests/drivers/net/netcons_basic.sh
  
  NETDEVSIM
  M:    Jakub Kicinski <[email protected]>
@@@ -16026,21 -15882,15 +16033,21 @@@ F:        drivers/net
  F:    include/dt-bindings/net/
  F:    include/linux/cn_proc.h
  F:    include/linux/etherdevice.h
 +F:    include/linux/ethtool_netlink.h
  F:    include/linux/fcdevice.h
  F:    include/linux/fddidevice.h
  F:    include/linux/hippidevice.h
  F:    include/linux/if_*
  F:    include/linux/inetdevice.h
 -F:    include/linux/netdevice.h
 +F:    include/linux/netdev*
 +F:    include/linux/platform_data/wiznet.h
  F:    include/uapi/linux/cn_proc.h
 +F:    include/uapi/linux/ethtool_netlink.h
  F:    include/uapi/linux/if_*
 -F:    include/uapi/linux/netdevice.h
 +F:    include/uapi/linux/netdev*
 +F:    tools/testing/selftests/drivers/net/
 +X:    Documentation/devicetree/bindings/net/bluetooth/
 +X:    Documentation/devicetree/bindings/net/wireless/
  X:    drivers/net/wireless/
  
  NETWORKING DRIVERS (WIRELESS)
@@@ -16091,28 -15941,14 +16098,28 @@@ F:        include/linux/framer/framer-provider
  F:    include/linux/framer/framer.h
  F:    include/linux/in.h
  F:    include/linux/indirect_call_wrapper.h
 +F:    include/linux/inet.h
 +F:    include/linux/inet_diag.h
  F:    include/linux/net.h
 -F:    include/linux/netdevice.h
 -F:    include/linux/skbuff.h
 +F:    include/linux/netdev*
 +F:    include/linux/netlink.h
 +F:    include/linux/netpoll.h
 +F:    include/linux/rtnetlink.h
 +F:    include/linux/seq_file_net.h
 +F:    include/linux/skbuff*
  F:    include/net/
 +F:    include/uapi/linux/genetlink.h
 +F:    include/uapi/linux/hsr_netlink.h
  F:    include/uapi/linux/in.h
 +F:    include/uapi/linux/inet_diag.h
 +F:    include/uapi/linux/nbd-netlink.h
  F:    include/uapi/linux/net.h
  F:    include/uapi/linux/net_namespace.h
 -F:    include/uapi/linux/netdevice.h
 +F:    include/uapi/linux/netconf.h
 +F:    include/uapi/linux/netdev*
 +F:    include/uapi/linux/netlink.h
 +F:    include/uapi/linux/netlink_diag.h
 +F:    include/uapi/linux/rtnetlink.h
  F:    lib/net_utils.c
  F:    lib/random32.c
  F:    net/
@@@ -16554,7 -16390,6 +16561,7 @@@ M:   Han Xu <[email protected]
  M:    Haibo Chen <[email protected]>
  R:    Yogesh Gaur <[email protected]>
  L:    [email protected]
 +L:    [email protected]
  S:    Maintained
  F:    Documentation/devicetree/bindings/spi/spi-nxp-fspi.yaml
  F:    drivers/spi/spi-nxp-fspi.c
@@@ -16964,6 -16799,7 +16971,7 @@@ OMNIVISION OG01A1B SENSOR DRIVE
  M:    Sakari Ailus <[email protected]>
  L:    [email protected]
  S:    Maintained
+ F:    Documentation/devicetree/bindings/media/i2c/ovti,og01a1b.yaml
  F:    drivers/media/i2c/og01a1b.c
  
  OMNIVISION OV01A10 SENSOR DRIVER
@@@ -17234,14 -17070,6 +17242,14 @@@ L: [email protected]
  S:    Supported
  F:    drivers/infiniband/ulp/opa_vnic
  
 +OPEN ALLIANCE 10BASE-T1S MACPHY SERIAL INTERFACE FRAMEWORK
 +M:    Parthiban Veerasooran <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    Documentation/networking/oa-tc6-framework.rst
 +F:    drivers/include/linux/oa_tc6.h
 +F:    drivers/net/ethernet/oa_tc6.c
 +
  OPEN FIRMWARE AND FLATTENED DEVICE TREE
  M:    Rob Herring <[email protected]>
  M:    Saravana Kannan <[email protected]>
@@@ -17274,7 -17102,7 +17282,7 @@@ F:   include/dt-bindings
  
  OPENCOMPUTE PTP CLOCK DRIVER
  M:    Jonathan Lemon <[email protected]>
 -M:    Vadim Fedorenko <vadfed@linux.dev>
 +M:    Vadim Fedorenko <vadim.fedorenko@linux.dev>
  L:    [email protected]
  S:    Maintained
  F:    drivers/ptp/ptp_ocp.c
@@@ -17553,7 -17381,7 +17561,7 @@@ PCI DRIVER FOR ALTERA PCIE I
  M:    Joyce Ooi <[email protected]>
  L:    [email protected]
  S:    Supported
 -F:    Documentation/devicetree/bindings/pci/altera-pcie.txt
 +F:    Documentation/devicetree/bindings/pci/altr,pcie-root-port.yaml
  F:    drivers/pci/controller/pcie-altera.c
  
  PCI DRIVER FOR APPLIEDMICRO XGENE
@@@ -17593,7 -17421,6 +17601,7 @@@ M:   Roy Zang <[email protected]
  L:    [email protected]
  L:    [email protected]
  L:    [email protected] (moderated for non-subscribers)
 +L:    [email protected]
  S:    Maintained
  F:    drivers/pci/controller/dwc/*layerscape*
  
@@@ -17620,7 -17447,6 +17628,7 @@@ M:   Richard Zhu <[email protected]
  M:    Lucas Stach <[email protected]>
  L:    [email protected]
  L:    [email protected] (moderated for non-subscribers)
 +L:    [email protected]
  S:    Maintained
  F:    Documentation/devicetree/bindings/pci/fsl,imx6q-pcie-common.yaml
  F:    Documentation/devicetree/bindings/pci/fsl,imx6q-pcie-ep.yaml
@@@ -17785,7 -17611,7 +17793,7 @@@ PCI MSI DRIVER FOR ALTERA MSI I
  M:    Joyce Ooi <[email protected]>
  L:    [email protected]
  S:    Supported
 -F:    Documentation/devicetree/bindings/pci/altera-pcie-msi.txt
 +F:    Documentation/devicetree/bindings/pci/altr,msi-controller.yaml
  F:    drivers/pci/controller/pcie-altera-msi.c
  
  PCI MSI DRIVER FOR APPLIEDMICRO XGENE
@@@ -17799,7 -17625,6 +17807,7 @@@ F:   drivers/pci/controller/pci-xgene-msi
  PCI NATIVE HOST BRIDGE AND ENDPOINT DRIVERS
  M:    Lorenzo Pieralisi <[email protected]>
  M:    Krzysztof Wilczyński <[email protected]>
 +R:    Manivannan Sadhasivam <[email protected]>
  R:    Rob Herring <[email protected]>
  L:    [email protected]
  S:    Supported
@@@ -17938,7 -17763,6 +17946,7 @@@ M:   Manivannan Sadhasivam <manivannan.sa
  L:    [email protected]
  L:    [email protected]
  S:    Maintained
 +F:    drivers/pci/controller/dwc/pcie-qcom-common.c
  F:    drivers/pci/controller/dwc/pcie-qcom.c
  
  PCIE DRIVER FOR ROCKCHIP
@@@ -17975,7 -17799,6 +17983,7 @@@ L:   [email protected]
  L:    [email protected]
  S:    Maintained
  F:    Documentation/devicetree/bindings/pci/qcom,pcie-ep.yaml
 +F:    drivers/pci/controller/dwc/pcie-qcom-common.c
  F:    drivers/pci/controller/dwc/pcie-qcom-ep.c
  
  PCMCIA SUBSYSTEM
@@@ -18387,7 -18210,6 +18395,7 @@@ M:   Bartosz Golaszewski <[email protected]
  L:    [email protected]
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git
 +F:    Documentation/driver-api/pwrseq.rst
  F:    drivers/power/sequencing/
  F:    include/linux/pwrseq/
  
@@@ -18551,7 -18373,6 +18559,7 @@@ L:   [email protected]
  S:    Maintained
  F:    Documentation/devicetree/bindings/net/pse-pd/
  F:    drivers/net/pse-pd/
 +F:    net/ethtool/pse-pd.c
  
  PSTORE FILESYSTEM
  M:    Kees Cook <[email protected]>
@@@ -18710,6 -18531,7 +18718,6 @@@ F:   drivers/crypto/intel/qat
  
  QCOM AUDIO (ASoC) DRIVERS
  M:    Srinivas Kandagatla <[email protected]>
 -M:    Banajit Goswami <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  L:    [email protected]
  S:    Supported
@@@ -18932,7 -18754,7 +18940,7 @@@ M:   Bryan O'Donoghue <bryan.odonoghue@li
  L:    [email protected]
  S:    Maintained
  F:    Documentation/admin-guide/media/qcom_camss.rst
- F:    Documentation/devicetree/bindings/media/*camss*
+ F:    Documentation/devicetree/bindings/media/qcom,*camss*
  F:    drivers/media/platform/qcom/camss/
  
  QUALCOMM CLOCK DRIVERS
@@@ -18947,6 -18769,7 +18955,6 @@@ F:   include/dt-bindings/clock/qcom,
  QUALCOMM CLOUD AI (QAIC) DRIVER
  M:    Jeffrey Hugo <[email protected]>
  R:    Carl Vanderlip <[email protected]>
 -R:    Pranjal Ramajor Asha Kanojiya <[email protected]>
  L:    [email protected]
  L:    [email protected]
  S:    Supported
@@@ -18957,7 -18780,7 +18965,7 @@@ F:   include/uapi/drm/qaic_accel.
  
  QUALCOMM CORE POWER REDUCTION (CPR) AVS DRIVER
  M:    Bjorn Andersson <[email protected]>
 -M:    Konrad Dybcio <konrad.dybcio@linaro.org>
 +M:    Konrad Dybcio <konradybcio@kernel.org>
  L:    [email protected]
  L:    [email protected]
  S:    Maintained
@@@ -19041,7 -18864,6 +19049,7 @@@ L:   [email protected]
  S:    Maintained
  F:    Documentation/devicetree/bindings/interconnect/qcom,msm8998-bwmon.yaml
  F:    drivers/soc/qcom/icc-bwmon.c
 +F:    drivers/soc/qcom/trace_icc-bwmon.h
  
  QUALCOMM IOMMU
  M:    Rob Clark <[email protected]>
@@@ -19381,7 -19203,6 +19389,7 @@@ S:   Supporte
  W:    https://oss.oracle.com/projects/rds/
  F:    Documentation/networking/rds.rst
  F:    net/rds/
 +F:    tools/testing/selftests/net/rds/
  
  RDT - RESOURCE ALLOCATION
  M:    Fenghua Yu <[email protected]>
@@@ -19884,14 -19705,6 +19892,14 @@@ F: Documentation/ABI/*/sysfs-driver-hid
  F:    drivers/hid/hid-roccat*
  F:    include/linux/hid-roccat*
  
 +ROCKCHIP CAN-FD DRIVER
 +M:    Marc Kleine-Budde <[email protected]>
 +R:    [email protected]
 +L:    [email protected]
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/net/can/rockchip,rk3568v2-canfd.yaml
 +F:    drivers/net/can/rockchip/
 +
  ROCKCHIP CRYPTO DRIVERS
  M:    Corentin Labbe <[email protected]>
  L:    [email protected]
@@@ -19918,13 -19731,6 +19926,13 @@@ F: Documentation/userspace-api/media/v4
  F:    drivers/media/platform/rockchip/rkisp1
  F:    include/uapi/linux/rkisp1-config.h
  
 +ROCKCHIP RK3568 RANDOM NUMBER GENERATOR SUPPORT
 +M:    Daniel Golle <[email protected]>
 +M:    Aurelien Jarno <[email protected]>
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/rng/rockchip,rk3568-rng.yaml
 +F:    drivers/char/hw_random/rockchip-rng.c
 +
  ROCKCHIP RASTER 2D GRAPHIC ACCELERATION UNIT DRIVER
  M:    Jacob Chen <[email protected]>
  M:    Ezequiel Garcia <[email protected]>
@@@ -20041,26 -19847,12 +20049,26 @@@ T:        git git://linuxtv.org/media_tree.gi
  F:    Documentation/devicetree/bindings/media/allwinner,sun8i-a83t-de2-rotate.yaml
  F:    drivers/media/platform/sunxi/sun8i-rotate/
  
 +RPMB SUBSYSTEM
 +M:    Jens Wiklander <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +F:    drivers/misc/rpmb-core.c
 +F:    include/linux/rpmb.h
 +
  RPMSG TTY DRIVER
  M:    Arnaud Pouliquen <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    drivers/tty/rpmsg_tty.c
  
 +RTASE ETHERNET DRIVER
 +M:    Justin Lai <[email protected]>
 +M:    Larry Chiu <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/net/ethernet/realtek/rtase/
 +
  RTL2830 MEDIA DRIVER
  L:    [email protected]
  S:    Orphan
@@@ -20121,11 -19913,12 +20129,11 @@@ F:        tools/verification
  RUST
  M:    Miguel Ojeda <[email protected]>
  M:    Alex Gaynor <[email protected]>
 -M:    Wedson Almeida Filho <[email protected]>
  R:    Boqun Feng <[email protected]>
  R:    Gary Guo <[email protected]>
  R:    Björn Roy Baron <[email protected]>
  R:    Benno Lossin <[email protected]>
 -R:    Andreas Hindborg <a.hindborg@samsung.com>
 +R:    Andreas Hindborg <a.hindborg@kernel.org>
  R:    Alice Ryhl <[email protected]>
  L:    [email protected]
  S:    Supported
@@@ -20325,16 -20118,6 +20333,16 @@@ B: mailto:[email protected]
  F:    Documentation/devicetree/bindings/sound/samsung*
  F:    sound/soc/samsung/
  
 +SAMSUNG EXYNOS850 SoC SUPPORT
 +M:    Sam Protsenko <[email protected]>
 +L:    [email protected] (moderated for non-subscribers)
 +L:    [email protected]
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/clock/samsung,exynos850-clock.yaml
 +F:    arch/arm64/boot/dts/exynos/exynos850*
 +F:    drivers/clk/samsung/clk-exynos850.c
 +F:    include/dt-bindings/clock/exynos850.h
 +
  SAMSUNG EXYNOS PSEUDO RANDOM NUMBER GENERATOR (RNG) DRIVER
  M:    Krzysztof Kozlowski <[email protected]>
  L:    [email protected]
@@@ -20522,19 -20305,6 +20530,19 @@@ F: include/linux/wait.
  F:    include/uapi/linux/sched.h
  F:    kernel/sched/
  
 +SCHEDULER - SCHED_EXT
 +R:    Tejun Heo <[email protected]>
 +R:    David Vernet <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +W:    https://github.com/sched-ext/scx
 +T:    git://git.kernel.org/pub/scm/linux/kernel/git/tj/sched_ext.git
 +F:    include/linux/sched/ext.h
 +F:    kernel/sched/ext.h
 +F:    kernel/sched/ext.c
 +F:    tools/sched_ext/
 +F:    tools/testing/selftests/sched_ext
 +
  SCIOSENSE ENS160 MULTI-GAS SENSOR DRIVER
  M:    Gustavo Silva <[email protected]>
  S:    Maintained
@@@ -20590,7 -20360,6 +20598,7 @@@ F:   Documentation/devicetree/bindings/sc
  F:    drivers/scsi/
  F:    drivers/ufs/
  F:    include/scsi/
 +F:    include/uapi/scsi/
  
  SCSI TAPE DRIVER
  M:    Kai Mäkisara <[email protected]>
@@@ -21291,7 -21060,6 +21299,7 @@@ SOCKET TIMESTAMPIN
  M:    Willem de Bruijn <[email protected]>
  S:    Maintained
  F:    Documentation/networking/timestamping.rst
 +F:    include/linux/net_tstamp.h
  F:    include/uapi/linux/net_tstamp.h
  F:    tools/testing/selftests/net/so_txtime.c
  
@@@ -21588,13 -21356,13 +21596,13 @@@ S:        Maintaine
  F:    tools/sound/dapm-graph
  
  SOUND - SOUND OPEN FIRMWARE (SOF) DRIVERS
 -M:    Pierre-Louis Bossart <[email protected]>
  M:    Liam Girdwood <[email protected]>
  M:    Peter Ujfalusi <[email protected]>
  M:    Bard Liao <[email protected]>
  M:    Ranjani Sridharan <[email protected]>
  M:    Daniel Baluta <[email protected]>
  R:    Kai Vehmanen <[email protected]>
 +R:    Pierre-Louis Bossart <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  S:    Supported
  W:    https://github.com/thesofproject/linux/
@@@ -21603,7 -21371,7 +21611,7 @@@ F:   sound/soc/sof
  SOUNDWIRE SUBSYSTEM
  M:    Vinod Koul <[email protected]>
  M:    Bard Liao <[email protected]>
 -R:    Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
 +R:    Pierre-Louis Bossart <pierre-louis.bossart@linux.dev>
  R:    Sanyog Kale <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  S:    Supported
@@@ -21735,8 -21503,10 +21743,8 @@@ F:  include/linux/spmi.
  F:    include/trace/events/spmi.h
  
  SPU FILE SYSTEM
 -M:    Jeremy Kerr <[email protected]>
  L:    [email protected]
 -S:    Supported
 -W:    http://www.ibm.com/developerworks/power/cell/
 +S:    Orphan
  F:    Documentation/filesystems/spufs/spufs.rst
  F:    arch/powerpc/platforms/cell/spufs/
  
@@@ -22665,7 -22435,6 +22673,7 @@@ M:   Jens Wiklander <jens.wiklander@linar
  R:    Sumit Garg <[email protected]>
  L:    [email protected]
  S:    Maintained
 +F:    Documentation/ABI/testing/sysfs-class-tee
  F:    Documentation/driver-api/tee.rst
  F:    Documentation/tee/
  F:    Documentation/userspace-api/tee.rst
@@@ -22711,7 -22480,6 +22719,7 @@@ M:   Thierry Reding <thierry.reding@gmail
  R:    Krishna Reddy <[email protected]>
  L:    [email protected]
  S:    Supported
 +F:    drivers/iommu/arm/arm-smmu-v3/tegra241-cmdqv.c
  F:    drivers/iommu/arm/arm-smmu/arm-smmu-nvidia.c
  F:    drivers/iommu/tegra*
  
@@@ -22817,11 -22585,12 +22825,11 @@@ F:        Documentation/devicetree/bindings/so
  F:    Documentation/devicetree/bindings/sound/ti,tas2562.yaml
  F:    Documentation/devicetree/bindings/sound/ti,tas2770.yaml
  F:    Documentation/devicetree/bindings/sound/ti,tas27xx.yaml
 +F:    Documentation/devicetree/bindings/sound/ti,tpa6130a2.yaml
  F:    Documentation/devicetree/bindings/sound/ti,pcm1681.yaml
  F:    Documentation/devicetree/bindings/sound/ti,pcm3168a.yaml
  F:    Documentation/devicetree/bindings/sound/ti,tlv320*.yaml
  F:    Documentation/devicetree/bindings/sound/ti,tlv320adcx140.yaml
 -F:    Documentation/devicetree/bindings/sound/tlv320aic31xx.txt
 -F:    Documentation/devicetree/bindings/sound/tpa6130a2.txt
  F:    include/sound/tas2*.h
  F:    include/sound/tlv320*.h
  F:    include/sound/tpa6130a2-plat.h
@@@ -23399,7 -23168,6 +23407,7 @@@ Q:   https://patchwork.kernel.org/project
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jarkko/linux-tpmdd.git
  F:    Documentation/devicetree/bindings/tpm/
  F:    drivers/char/tpm/
 +F:    tools/testing/selftests/tpm2/
  
  TPS546D24 DRIVER
  M:    Duke Du <[email protected]>
@@@ -23412,8 -23180,9 +23420,8 @@@ TQ SYSTEMS BOARD & DRIVER SUPPOR
  L:    [email protected]
  S:    Supported
  W:    https://www.tq-group.com/en/products/tq-embedded/
 -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/arm/boot/dts/nxp/imx/*mba*.dts*
 +F:    arch/arm/boot/dts/nxp/imx/*tqma*.dts*
  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*
@@@ -23698,15 -23467,6 +23706,15 @@@ F: drivers/cdrom/cdrom.
  F:    include/linux/cdrom.h
  F:    include/uapi/linux/cdrom.h
  
 +UNION-FIND
 +M:    Xavier <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    Documentation/core-api/union_find.rst
 +F:    Documentation/translations/zh_CN/core-api/union_find.rst
 +F:    include/linux/union_find.h
 +F:    lib/union_find.c
 +
  UNIVERSAL FLASH STORAGE HOST CONTROLLER DRIVER
  R:    Alim Akhtar <[email protected]>
  R:    Avri Altman <[email protected]>
@@@ -24067,8 -23827,10 +24075,8 @@@ F:  drivers/media/usb/uvc
  F:    include/uapi/linux/uvcvideo.h
  
  USB WEBCAM GADGET
 -M:    Laurent Pinchart <[email protected]>
 -M:    Daniel Scally <[email protected]>
  L:    [email protected]
 -S:    Maintained
 +S:    Orphan
  F:    drivers/usb/gadget/function/*uvc*
  F:    drivers/usb/gadget/legacy/webcam.c
  F:    include/uapi/linux/usb/g_uvc.h
@@@ -24630,20 -24392,6 +24638,20 @@@ F: include/uapi/linux/vsockmon.
  F:    net/vmw_vsock/
  F:    tools/testing/vsock/
  
 +VMA
 +M:    Andrew Morton <[email protected]>
 +R:    Liam R. Howlett <[email protected]>
 +R:    Vlastimil Babka <[email protected]>
 +R:    Lorenzo Stoakes <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +W:    https://www.linux-mm.org
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
 +F:    mm/vma.c
 +F:    mm/vma.h
 +F:    mm/vma_internal.h
 +F:    tools/testing/vma/
 +
  VMALLOC
  M:    Andrew Morton <[email protected]>
  R:    Uladzislau Rezki <[email protected]>
@@@ -25033,17 -24781,6 +25041,17 @@@ T: git git://git.kernel.org/pub/scm/lin
  F:    Documentation/arch/x86/
  F:    Documentation/devicetree/bindings/x86/
  F:    arch/x86/
 +F:    tools/testing/selftests/x86
 +
 +X86 CPUID DATABASE
 +M:    Borislav Petkov <[email protected]>
 +M:    Thomas Gleixner <[email protected]>
 +M:    [email protected]
 +R:    Ahmed S. Darwish <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +W:    https://x86-cpuid.org
 +F:    tools/arch/x86/kcpuid/cpuid.csv
  
  X86 ENTRY CODE
  M:    Andy Lutomirski <[email protected]>
@@@ -25486,19 -25223,6 +25494,19 @@@ S: Maintaine
  F:    drivers/spi/spi-xtensa-xtfpga.c
  F:    sound/soc/xtensa/xtfpga-i2s.c
  
 +XZ EMBEDDED
 +M:    Lasse Collin <[email protected]>
 +S:    Maintained
 +W:    https://tukaani.org/xz/embedded.html
 +B:    https://github.com/tukaani-project/xz-embedded/issues
 +C:    irc://irc.libera.chat/tukaani
 +F:    Documentation/staging/xz.rst
 +F:    include/linux/decompress/unxz.h
 +F:    include/linux/xz.h
 +F:    lib/decompress_unxz.c
 +F:    lib/xz/
 +F:    scripts/xz_wrap.sh
 +
  YAM DRIVER FOR AX.25
  M:    Jean-Paul Roubelat <[email protected]>
  L:    [email protected]

diff --combined drivers/media/pci/intel/ipu6/ipu6.c
index 83e70c692d957f5d0b3d479c84fd99f2a16d2069,d10cbdd088ab8c73fe59d6e60b1b10ca3a3a10e9..7fb707d353096797a2e3b9d6db3fa2e74f3cb619
--- 1/drivers/media/pci/intel/ipu6/ipu6.c
--- 2/drivers/media/pci/intel/ipu6/ipu6.c
+++ b/drivers/media/pci/intel/ipu6/ipu6.c
@@@ -390,20 -390,18 +390,18 @@@ ipu6_isys_init(struct pci_dev *pdev, st
        isys_adev = ipu6_bus_initialize_device(pdev, parent, pdata, ctrl,
                                               IPU6_ISYS_NAME);
        if (IS_ERR(isys_adev)) {
-               dev_err_probe(dev, PTR_ERR(isys_adev),
-                             "ipu6_bus_initialize_device isys failed\n");
                kfree(pdata);
-               return ERR_CAST(isys_adev);
+               return dev_err_cast_probe(dev, isys_adev,
+                               "ipu6_bus_initialize_device isys failed\n");
        }
  
        isys_adev->mmu = ipu6_mmu_init(dev, base, ISYS_MMID,
                                       &ipdata->hw_variant);
        if (IS_ERR(isys_adev->mmu)) {
-               dev_err_probe(dev, PTR_ERR(isys_adev->mmu),
-                             "ipu6_mmu_init(isys_adev->mmu) failed\n");
                put_device(&isys_adev->auxdev.dev);
                kfree(pdata);
-               return ERR_CAST(isys_adev->mmu);
+               return dev_err_cast_probe(dev, isys_adev->mmu,
+                               "ipu6_mmu_init(isys_adev->mmu) failed\n");
        }
  
        isys_adev->mmu->dev = &isys_adev->auxdev.dev;
@@@ -436,20 -434,18 +434,18 @@@ ipu6_psys_init(struct pci_dev *pdev, st
        psys_adev = ipu6_bus_initialize_device(pdev, parent, pdata, ctrl,
                                               IPU6_PSYS_NAME);
        if (IS_ERR(psys_adev)) {
-               dev_err_probe(&pdev->dev, PTR_ERR(psys_adev),
-                             "ipu6_bus_initialize_device psys failed\n");
                kfree(pdata);
-               return ERR_CAST(psys_adev);
+               return dev_err_cast_probe(&pdev->dev, psys_adev,
+                               "ipu6_bus_initialize_device psys failed\n");
        }
  
        psys_adev->mmu = ipu6_mmu_init(&pdev->dev, base, PSYS_MMID,
                                       &ipdata->hw_variant);
        if (IS_ERR(psys_adev->mmu)) {
-               dev_err_probe(&pdev->dev, PTR_ERR(psys_adev->mmu),
-                             "ipu6_mmu_init(psys_adev->mmu) failed\n");
                put_device(&psys_adev->auxdev.dev);
                kfree(pdata);
-               return ERR_CAST(psys_adev->mmu);
+               return dev_err_cast_probe(&pdev->dev, psys_adev->mmu,
+                               "ipu6_mmu_init(psys_adev->mmu) failed\n");
        }
  
        psys_adev->mmu->dev = &psys_adev->auxdev.dev;
@@@ -576,7 -572,9 +572,7 @@@ static int ipu6_pci_probe(struct pci_de
        if (ret)
                return dev_err_probe(dev, ret, "Failed to set DMA mask\n");
  
 -      ret = dma_set_max_seg_size(dev, UINT_MAX);
 -      if (ret)
 -              return dev_err_probe(dev, ret, "Failed to set max_seg_size\n");
 +      dma_set_max_seg_size(dev, UINT_MAX);
  
        ret = ipu6_pci_config_setup(pdev, isp->hw_ver);
        if (ret)

diff --combined drivers/media/platform/qcom/venus/hfi_cmds.h
index 1adf2d2ae5f2e66430027892958d0bc70115d3fe,c4d165a2d325f558362cacd6c3ed21d716184bfc..a83125bc17aab9c338383c61c6ebdbbd397049eb
--- 1/drivers/media/platform/qcom/venus/hfi_cmds.h
--- 2/drivers/media/platform/qcom/venus/hfi_cmds.h
+++ b/drivers/media/platform/qcom/venus/hfi_cmds.h
@@@ -74,7 -74,7 +74,7 @@@ struct hfi_sys_set_property_pkt 
  struct hfi_sys_get_property_pkt {
        struct hfi_pkt_hdr hdr;
        u32 num_properties;
-       u32 data[1];
+       u32 data;
  };
  
  struct hfi_sys_set_buffers_pkt {
@@@ -82,7 -82,7 +82,7 @@@
        u32 buffer_type;
        u32 buffer_size;
        u32 num_buffers;
-       u32 buffer_addr[1];
+       u32 buffer_addr[];
  };
  
  struct hfi_sys_ping_pkt {
@@@ -151,7 -151,7 +151,7 @@@ struct hfi_session_empty_buffer_compres
        u32 input_tag;
        u32 packet_buffer;
        u32 extradata_buffer;
-       u32 data[1];
+       u32 data;
  };
  
  struct hfi_session_empty_buffer_uncompressed_plane0_pkt {
@@@ -168,7 -168,7 +168,7 @@@
        u32 input_tag;
        u32 packet_buffer;
        u32 extradata_buffer;
-       u32 data[1];
+       u32 data;
  };
  
  struct hfi_session_empty_buffer_uncompressed_plane1_pkt {
@@@ -177,7 -177,7 +177,7 @@@
        u32 filled_len;
        u32 offset;
        u32 packet_buffer2;
-       u32 data[1];
+       u32 data;
  };
  
  struct hfi_session_empty_buffer_uncompressed_plane2_pkt {
@@@ -186,7 -186,7 +186,7 @@@
        u32 filled_len;
        u32 offset;
        u32 packet_buffer3;
-       u32 data[1];
+       u32 data;
  };
  
  struct hfi_session_fill_buffer_pkt {
@@@ -198,7 -198,7 +198,7 @@@
        u32 output_tag;
        u32 packet_buffer;
        u32 extradata_buffer;
-       u32 data[1];
+       u32 data;
  };
  
  struct hfi_session_flush_pkt {
@@@ -217,7 -217,7 +217,7 @@@ struct hfi_session_resume_pkt 
  struct hfi_session_get_property_pkt {
        struct hfi_session_hdr_pkt shdr;
        u32 num_properties;
-       u32 data[1];
+       u32 data;
  };
  
  struct hfi_session_release_buffer_pkt {
@@@ -227,7 -227,7 +227,7 @@@
        u32 extradata_size;
        u32 response_req;
        u32 num_buffers;
 -      u32 buffer_info[1];
 +      u32 buffer_info[] __counted_by(num_buffers);
  };
  
  struct hfi_session_release_resources_pkt {

diff --combined drivers/staging/media/atomisp/include/linux/atomisp.h
index fefbe3cd08f33d42ef81911088faabf343e42a32,4f440ea2fcc1464e438b09adae83adc11561c272..4cfe9a0e0d56faec669f3310a12bf5f93a88cd5e
--- 1/drivers/staging/media/atomisp/include/linux/atomisp.h
--- 2/drivers/staging/media/atomisp/include/linux/atomisp.h
+++ b/drivers/staging/media/atomisp/include/linux/atomisp.h
@@@ -20,6 -20,7 +20,6 @@@
  #define _ATOM_ISP_H
  
  #include <linux/types.h>
 -#include <linux/version.h>
  
  /* struct media_device_info.hw_revision */
  #define ATOMISP_HW_REVISION_MASK      0x0000ff00
@@@ -200,7 -201,7 +200,7 @@@ struct atomisp_dis_vector 
  };
  
  /* DVS 2.0 Coefficient types. This structure contains 4 pointers to
-  *  arrays that contain the coeffients for each type.
+  *  arrays that contain the coefficients for each type.
   */
  struct atomisp_dvs2_coef_types {
        short __user *odd_real; /** real part of the odd coefficients*/
@@@ -698,7 -699,7 +698,7 @@@ enum atomisp_burst_capture_options 
  /* Digital Image Stabilization:
   * 1. get dis statistics: reads DIS statistics from ISP (every frame)
   * 2. set dis coefficients: set DIS filter coefficients (one time)
-  * 3. set dis motion vecotr: set motion vector (result of DIS, every frame)
+  * 3. set dis motion vector: set motion vector (result of DIS, every frame)
   */
  #define ATOMISP_IOC_G_DIS_STAT \
        _IOWR('v', BASE_VIDIOC_PRIVATE + 6, struct atomisp_dis_statistics)