Merge tag 'thermal-v5.20-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/therma...

Pull thermal control changes for 5.20-rc1 from Daniel Lezcano:

"- Make per cpufreq / devfreq cooling device ops instead of using a
   global variable, fix comments and rework the trace information
   (Lukasz Luba)

 - Add the include/dt-bindings/thermal.h under the area covered by the
   thermal maintainer in the MAINTAINERS file (Lukas Bulwahn)

 - Improve the error output by giving the sensor identification when a
   thermal zone failed to initialize, the DT bindings by changing the
   positive logic and adding the r8a779f0 support on the rcar3 (Wolfram
   Sang)

 - Convert the QCom tsens DT binding to the dtsformat format (Krzysztof
   Kozlowski)

 - Remove the pointless get_trend() function in the QCom, Ux500 and
   tegra thermal drivers, along with the unused DROP_FULL and
   RAISE_FULL trends definitions. Simplify the code by using clamp()
   macros (Daniel Lezcano)

 - Fix ref_table memory leak at probe time on the k3_j72xx bandgap
   (Bryan Brattlof)

 - Fix array underflow in prep_lookup_table (Dan Carpenter)

 - Add static annotation to the k3_j72xx_bandgap_j7* data structure
   (Jin Xiaoyun)

 - Fix typos in comments detected on sun8i by Coccinelle (Julia Lawall)

 - Fix typos in comments on rzg2l (Biju Das)

 - Remove as unnecessary call to dev_err() as the error is already
   printed by the failing function on u8500 (Yang Li)

 - Register the thermal zones as hwmon sensors for the Qcom thermal
   sensors (Dmitry Baryshkov)

 - Fix 'tmon' tool compilation issue by adding phtread.h include
   (Markus Mayer)

 - Fix typo in the comments for the 'tmon' tool (Slark Xiao)

 - Consolidate the thermal core code by beginning to move the thermal
   trip structure from the thermal OF code as a generic structure to be
   used by the different sensors when registering a thermal zone
   (Daniel Lezcano)"

* tag 'thermal-v5.20-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/thermal/linux: (36 commits)
  thermal/of: Initialize trip points separately
  thermal/of: Use thermal trips stored in the thermal zone
  thermal/core: Add thermal_trip in thermal_zone
  thermal/core: Rename 'trips' to 'num_trips'
  thermal/core: Move thermal_set_delay_jiffies to static
  thermal/core: Remove unneeded EXPORT_SYMBOLS
  thermal/of: Move thermal_trip structure to thermal.h
  thermal/of: Remove the device node pointer for thermal_trip
  thermal/of: Replace device node match with device node search
  thermal/core: Remove duplicate information when an error occurs
  thermal/core: Avoid calling ->get_trip_temp() unnecessarily
  thermal/tools/tmon: Fix typo 'the the' in comment
  thermal/tools/tmon: Include pthread and time headers in tmon.h
  thermal/ti-soc-thermal: Fix comment typo
  thermal/drivers/qcom/spmi-adc-tm5: Register thermal zones as hwmon sensors
  thermal/drivers/qcom/temp-alarm: Register thermal zones as hwmon sensors
  thermal/drivers/u8500: Remove unnecessary print function dev_err()
  thermal/drivers/rzg2l: Fix comments
  thermal/drivers/sun8i: Fix typo in comment
  thermal/drivers/k3_j72xx_bandgap: Make k3_j72xx_bandgap_j721e_data and k3_j72xx_bandgap_j7200_data static
  ...

diff --combined MAINTAINERS
index f679152bdbadf9a2ef67d6b3aad70509ab46f453,b0fbf28d55e66c1ca3b581ef0d8106570b47ecfb..045e09c902a88f2bffbfdd9a3f7d4b683ec13550
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -382,7 -382,7 +382,7 @@@ F: include/acpi
  F:    tools/power/acpi/
  
  ACPI FOR ARM64 (ACPI/arm64)
 -M:    Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
 +M:    Lorenzo Pieralisi <lpieralisi@kernel.org>
  M:    Hanjun Guo <guohanjun@huawei.com>
  M:    Sudeep Holla <sudeep.holla@arm.com>
  L:    linux-acpi@vger.kernel.org
@@@ -426,7 -426,7 +426,7 @@@ F: drivers/acpi/*thermal
  ACPI VIOT DRIVER
  M:    Jean-Philippe Brucker <jean-philippe@linaro.org>
  L:    linux-acpi@vger.kernel.org
 -L:    iommu@lists.linux-foundation.org
 +L:    iommu@lists.linux.dev
  S:    Maintained
  F:    drivers/acpi/viot.c
  F:    include/linux/acpi_viot.h
@@@ -820,7 -820,7 +820,7 @@@ S: Maintaine
  F:    drivers/mailbox/mailbox-altera.c
  
  ALTERA MSGDMA IP CORE DRIVER
 -M:    Olivier Dautricourt <olivier.dautricourt@orolia.com>
 +M:    Olivier Dautricourt <olivierdautricourt@gmail.com>
  R:    Stefan Roese <sr@denx.de>
  L:    dmaengine@vger.kernel.org
  S:    Odd Fixes
@@@ -959,7 -959,7 +959,7 @@@ F: drivers/video/fbdev/geode
  AMD IOMMU (AMD-VI)
  M:    Joerg Roedel <joro@8bytes.org>
  R:    Suravee Suthikulpanit <suravee.suthikulpanit@amd.com>
 -L:    iommu@lists.linux-foundation.org
 +L:    iommu@lists.linux.dev
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git
  F:    drivers/iommu/amd/
@@@ -1090,14 -1090,6 +1090,14 @@@ W:    https://ez.analog.com/linux-software
  F:    Documentation/devicetree/bindings/iio/adc/adi,ad7292.yaml
  F:    drivers/iio/adc/ad7292.c
  
 +ANALOG DEVICES INC AD3552R DRIVER
 +M:    Nuno Sá <nuno.sa@analog.com>
 +L:    linux-iio@vger.kernel.org
 +S:    Supported
 +W:    https://ez.analog.com/linux-software-drivers
 +F:    Documentation/devicetree/bindings/iio/dac/adi,ad3552r.yaml
 +F:    drivers/iio/dac/ad3552r.c
 +
  ANALOG DEVICES INC AD7293 DRIVER
  M:    Antoniu Miclaus <antoniu.miclaus@analog.com>
  L:    linux-iio@vger.kernel.org
@@@ -1383,6 -1375,14 +1383,6 @@@ L:     linux-input@vger.kernel.or
  S:    Odd fixes
  F:    drivers/input/mouse/bcm5974.c
  
 -APPLE DART IOMMU DRIVER
 -M:    Sven Peter <sven@svenpeter.dev>
 -R:    Alyssa Rosenzweig <alyssa@rosenzweig.io>
 -L:    iommu@lists.linux-foundation.org
 -S:    Maintained
 -F:    Documentation/devicetree/bindings/iommu/apple,dart.yaml
 -F:    drivers/iommu/apple-dart.c
 -
  APPLE PCIE CONTROLLER DRIVER
  M:    Alyssa Rosenzweig <alyssa@rosenzweig.io>
  M:    Marc Zyngier <maz@kernel.org>
@@@ -1507,7 -1507,7 +1507,7 @@@ F:      drivers/clocksource/arm_arch_timer.
  ARM HDLCD DRM DRIVER
  M:    Liviu Dudau <liviu.dudau@arm.com>
  S:    Supported
 -F:    Documentation/devicetree/bindings/display/arm,hdlcd.txt
 +F:    Documentation/devicetree/bindings/display/arm,hdlcd.yaml
  F:    drivers/gpu/drm/arm/hdlcd_*
  
  ARM INTEGRATOR, VERSATILE AND REALVIEW SUPPORT
@@@ -1526,7 -1526,10 +1526,7 @@@ F:     Documentation/devicetree/bindings/mt
  F:    arch/arm/boot/dts/arm-realview-*
  F:    arch/arm/boot/dts/integrator*
  F:    arch/arm/boot/dts/versatile*
 -F:    arch/arm/mach-integrator/
 -F:    arch/arm/mach-realview/
  F:    arch/arm/mach-versatile/
 -F:    arch/arm/plat-versatile/
  F:    drivers/bus/arm-integrator-lm.c
  F:    drivers/clk/versatile/
  F:    drivers/i2c/busses/i2c-versatile.c
@@@ -1542,7 -1545,7 +1542,7 @@@ M:      Mihail Atanassov <mihail.atanassov@a
  L:    Mali DP Maintainers <malidp@foss.arm.com>
  S:    Supported
  T:    git git://anongit.freedesktop.org/drm/drm-misc
 -F:    Documentation/devicetree/bindings/display/arm,komeda.txt
 +F:    Documentation/devicetree/bindings/display/arm,komeda.yaml
  F:    Documentation/gpu/komeda-kms.rst
  F:    drivers/gpu/drm/arm/display/include/
  F:    drivers/gpu/drm/arm/display/komeda/
@@@ -1564,7 -1567,7 +1564,7 @@@ M:      Brian Starkey <brian.starkey@arm.com
  L:    Mali DP Maintainers <malidp@foss.arm.com>
  S:    Supported
  T:    git git://anongit.freedesktop.org/drm/drm-misc
 -F:    Documentation/devicetree/bindings/display/arm,malidp.txt
 +F:    Documentation/devicetree/bindings/display/arm,malidp.yaml
  F:    Documentation/gpu/afbc.rst
  F:    drivers/gpu/drm/arm/
  
@@@ -1834,11 -1837,7 +1834,11 @@@ F:    Documentation/devicetree/bindings/ar
  F:    Documentation/devicetree/bindings/clock/apple,nco.yaml
  F:    Documentation/devicetree/bindings/i2c/apple,i2c.yaml
  F:    Documentation/devicetree/bindings/interrupt-controller/apple,*
 +F:    Documentation/devicetree/bindings/iommu/apple,dart.yaml
 +F:    Documentation/devicetree/bindings/iommu/apple,sart.yaml
  F:    Documentation/devicetree/bindings/mailbox/apple,mailbox.yaml
 +F:    Documentation/devicetree/bindings/nvme/apple,nvme-ans.yaml
 +F:    Documentation/devicetree/bindings/nvmem/apple,efuses.yaml
  F:    Documentation/devicetree/bindings/pci/apple,pcie.yaml
  F:    Documentation/devicetree/bindings/pinctrl/apple,pinctrl.yaml
  F:    Documentation/devicetree/bindings/power/apple*
@@@ -1847,18 -1846,14 +1847,18 @@@ F:   arch/arm64/boot/dts/apple
  F:    drivers/clk/clk-apple-nco.c
  F:    drivers/i2c/busses/i2c-pasemi-core.c
  F:    drivers/i2c/busses/i2c-pasemi-platform.c
 +F:    drivers/iommu/apple-dart.c
  F:    drivers/irqchip/irq-apple-aic.c
  F:    drivers/mailbox/apple-mailbox.c
 +F:    drivers/nvme/host/apple.c
 +F:    drivers/nvmem/apple-efuses.c
  F:    drivers/pinctrl/pinctrl-apple-gpio.c
  F:    drivers/soc/apple/*
  F:    drivers/watchdog/apple_wdt.c
  F:    include/dt-bindings/interrupt-controller/apple-aic.h
  F:    include/dt-bindings/pinctrl/apple.h
  F:    include/linux/apple-mailbox.h
 +F:    include/linux/soc/apple/*
  
  ARM/ARTPEC MACHINE SUPPORT
  M:    Jesper Nilsson <jesper.nilsson@axis.com>
@@@ -2009,7 -2004,7 +2009,7 @@@ L:      linux-arm-kernel@lists.infradead.or
  S:    Maintained
  T:    git git://github.com/ulli-kroll/linux.git
  F:    Documentation/devicetree/bindings/arm/gemini.yaml
 -F:    Documentation/devicetree/bindings/net/cortina,gemini-ethernet.txt
 +F:    Documentation/devicetree/bindings/net/cortina,gemini-ethernet.yaml
  F:    Documentation/devicetree/bindings/pinctrl/cortina,gemini-pinctrl.txt
  F:    Documentation/devicetree/bindings/rtc/faraday,ftrtc010.yaml
  F:    arch/arm/boot/dts/gemini*
@@@ -2135,18 -2130,6 +2135,18 @@@ T:    git git://git.kernel.org/pub/scm/lin
  F:    arch/arm/mach-sa1100/include/mach/jornada720.h
  F:    arch/arm/mach-sa1100/jornada720.c
  
 +ARM/HPE GXP ARCHITECTURE
 +M:    Jean-Marie Verdun <verdun@hpe.com>
 +M:    Nick Hawkins <nick.hawkins@hpe.com>
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/arm/hpe,gxp.yaml
 +F:    Documentation/devicetree/bindings/timer/hpe,gxp-timer.yaml
 +F:    arch/arm/boot/dts/hpe-bmc*
 +F:    arch/arm/boot/dts/hpe-gxp*
 +F:    arch/arm/mach-hpe/
 +F:    drivers/clocksource/timer-gxp.c
 +F:    drivers/watchdog/gxp-wdt.c
 +
  ARM/IGEP MACHINE SUPPORT
  M:    Enric Balletbo i Serra <eballetbo@gmail.com>
  M:    Javier Martinez Canillas <javier@dowhile0.org>
@@@ -2467,7 -2450,6 +2467,7 @@@ ARM/NXP S32G ARCHITECTUR
  M:    Chester Lin <clin@suse.com>
  R:    Andreas Färber <afaerber@suse.de>
  R:    Matthias Brugger <mbrugger@suse.com>
 +R:    NXP S32 Linux Team <s32@nxp.com>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Maintained
  F:    arch/arm64/boot/dts/freescale/s32g*.dts*
@@@ -2538,7 -2520,6 +2538,7 @@@ W:      http://www.armlinux.org.uk
  ARM/QUALCOMM SUPPORT
  M:    Andy Gross <agross@kernel.org>
  M:    Bjorn Andersson <bjorn.andersson@linaro.org>
 +R:    Konrad Dybcio <konrad.dybcio@somainline.org>
  L:    linux-arm-msm@vger.kernel.org
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux.git
@@@ -2567,7 -2548,7 +2567,7 @@@ F:      drivers/pci/controller/dwc/pcie-qcom
  F:    drivers/phy/qualcomm/
  F:    drivers/power/*/msm*
  F:    drivers/reset/reset-qcom-*
 -F:    drivers/scsi/ufs/ufs-qcom*
 +F:    drivers/ufs/host/ufs-qcom*
  F:    drivers/spi/spi-geni-qcom.c
  F:    drivers/spi/spi-qcom-qspi.c
  F:    drivers/spi/spi-qup.c
@@@ -2591,7 -2572,7 +2591,7 @@@ F:      Documentation/devicetree/bindings/ar
  F:    Documentation/devicetree/bindings/gpio/gpio-rda.yaml
  F:    Documentation/devicetree/bindings/interrupt-controller/rda,8810pl-intc.txt
  F:    Documentation/devicetree/bindings/serial/rda,8810pl-uart.yaml
 -F:    Documentation/devicetree/bindings/timer/rda,8810pl-timer.txt
 +F:    Documentation/devicetree/bindings/timer/rda,8810pl-timer.yaml
  F:    arch/arm/boot/dts/rda8810pl-*
  F:    drivers/clocksource/timer-rda.c
  F:    drivers/gpio/gpio-rda.c
@@@ -2964,7 -2945,7 +2964,7 @@@ N:      uniphie
  ARM/VERSATILE EXPRESS PLATFORM
  M:    Liviu Dudau <liviu.dudau@arm.com>
  M:    Sudeep Holla <sudeep.holla@arm.com>
 -M:    Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
 +M:    Lorenzo Pieralisi <lpieralisi@kernel.org>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Maintained
  F:    */*/*/vexpress*
@@@ -3535,14 -3516,10 +3535,14 @@@ R:   Andy Shevchenko <andriy.shevchenko@l
  R:    Rasmus Villemoes <linux@rasmusvillemoes.dk>
  S:    Maintained
  F:    include/linux/bitmap.h
 +F:    include/linux/cpumask.h
  F:    include/linux/find.h
 +F:    include/linux/nodemask.h
  F:    lib/bitmap.c
 +F:    lib/cpumask.c
  F:    lib/find_bit.c
  F:    lib/find_bit_benchmark.c
 +F:    lib/nodemask.c
  F:    lib/test_bitmap.c
  F:    tools/include/linux/bitmap.h
  F:    tools/include/linux/find.h
@@@ -3616,18 -3593,16 +3616,18 @@@ S:   Maintaine
  F:    Documentation/devicetree/bindings/iio/accel/bosch,bma400.yaml
  F:    drivers/iio/accel/bma400*
  
 -BPF (Safe dynamic programs and tools)
 +BPF [GENERAL] (Safe Dynamic Programs and Tools)
  M:    Alexei Starovoitov <ast@kernel.org>
  M:    Daniel Borkmann <daniel@iogearbox.net>
  M:    Andrii Nakryiko <andrii@kernel.org>
 -R:    Martin KaFai Lau <kafai@fb.com>
 -R:    Song Liu <songliubraving@fb.com>
 +R:    Martin KaFai Lau <martin.lau@linux.dev>
 +R:    Song Liu <song@kernel.org>
  R:    Yonghong Song <yhs@fb.com>
  R:    John Fastabend <john.fastabend@gmail.com>
  R:    KP Singh <kpsingh@kernel.org>
 -L:    netdev@vger.kernel.org
 +R:    Stanislav Fomichev <sdf@google.com>
 +R:    Hao Luo <haoluo@google.com>
 +R:    Jiri Olsa <jolsa@kernel.org>
  L:    bpf@vger.kernel.org
  S:    Supported
  W:    https://bpf.io/
@@@ -3659,17 -3634,21 +3659,17 @@@ F:   scripts/pahole-version.s
  F:    tools/bpf/
  F:    tools/lib/bpf/
  F:    tools/testing/selftests/bpf/
 -N:    bpf
 -K:    bpf
  
  BPF JIT for ARM
  M:    Shubham Bansal <illusionist.neo@gmail.com>
 -L:    netdev@vger.kernel.org
  L:    bpf@vger.kernel.org
 -S:    Maintained
 +S:    Odd Fixes
  F:    arch/arm/net/
  
  BPF JIT for ARM64
  M:    Daniel Borkmann <daniel@iogearbox.net>
  M:    Alexei Starovoitov <ast@kernel.org>
  M:    Zi Shen Lim <zlim.lnx@gmail.com>
 -L:    netdev@vger.kernel.org
  L:    bpf@vger.kernel.org
  S:    Supported
  F:    arch/arm64/net/
@@@ -3677,26 -3656,29 +3677,26 @@@
  BPF JIT for MIPS (32-BIT AND 64-BIT)
  M:    Johan Almbladh <johan.almbladh@anyfinetworks.com>
  M:    Paul Burton <paulburton@kernel.org>
 -L:    netdev@vger.kernel.org
  L:    bpf@vger.kernel.org
  S:    Maintained
  F:    arch/mips/net/
  
  BPF JIT for NFP NICs
  M:    Jakub Kicinski <kuba@kernel.org>
 -L:    netdev@vger.kernel.org
  L:    bpf@vger.kernel.org
 -S:    Supported
 +S:    Odd Fixes
  F:    drivers/net/ethernet/netronome/nfp/bpf/
  
  BPF JIT for POWERPC (32-BIT AND 64-BIT)
  M:    Naveen N. Rao <naveen.n.rao@linux.ibm.com>
 -L:    netdev@vger.kernel.org
 +M:    Michael Ellerman <mpe@ellerman.id.au>
  L:    bpf@vger.kernel.org
 -S:    Maintained
 +S:    Supported
  F:    arch/powerpc/net/
  
  BPF JIT for RISC-V (32-bit)
  M:    Luke Nelson <luke.r.nels@gmail.com>
  M:    Xi Wang <xi.wang@gmail.com>
 -L:    netdev@vger.kernel.org
  L:    bpf@vger.kernel.org
  S:    Maintained
  F:    arch/riscv/net/
@@@ -3704,6 -3686,7 +3704,6 @@@ X:      arch/riscv/net/bpf_jit_comp64.
  
  BPF JIT for RISC-V (64-bit)
  M:    Björn Töpel <bjorn@kernel.org>
 -L:    netdev@vger.kernel.org
  L:    bpf@vger.kernel.org
  S:    Maintained
  F:    arch/riscv/net/
@@@ -3713,80 -3696,36 +3713,80 @@@ BPF JIT for S39
  M:    Ilya Leoshkevich <iii@linux.ibm.com>
  M:    Heiko Carstens <hca@linux.ibm.com>
  M:    Vasily Gorbik <gor@linux.ibm.com>
 -L:    netdev@vger.kernel.org
  L:    bpf@vger.kernel.org
 -S:    Maintained
 +S:    Supported
  F:    arch/s390/net/
  X:    arch/s390/net/pnet.c
  
  BPF JIT for SPARC (32-BIT AND 64-BIT)
  M:    David S. Miller <davem@davemloft.net>
 -L:    netdev@vger.kernel.org
  L:    bpf@vger.kernel.org
 -S:    Maintained
 +S:    Odd Fixes
  F:    arch/sparc/net/
  
  BPF JIT for X86 32-BIT
  M:    Wang YanQing <udknight@gmail.com>
 -L:    netdev@vger.kernel.org
  L:    bpf@vger.kernel.org
 -S:    Maintained
 +S:    Odd Fixes
  F:    arch/x86/net/bpf_jit_comp32.c
  
  BPF JIT for X86 64-BIT
  M:    Alexei Starovoitov <ast@kernel.org>
  M:    Daniel Borkmann <daniel@iogearbox.net>
 -L:    netdev@vger.kernel.org
  L:    bpf@vger.kernel.org
  S:    Supported
  F:    arch/x86/net/
  X:    arch/x86/net/bpf_jit_comp32.c
  
 -BPF LSM (Security Audit and Enforcement using BPF)
 +BPF [CORE]
 +M:    Alexei Starovoitov <ast@kernel.org>
 +M:    Daniel Borkmann <daniel@iogearbox.net>
 +R:    John Fastabend <john.fastabend@gmail.com>
 +L:    bpf@vger.kernel.org
 +S:    Maintained
 +F:    kernel/bpf/verifier.c
 +F:    kernel/bpf/tnum.c
 +F:    kernel/bpf/core.c
 +F:    kernel/bpf/syscall.c
 +F:    kernel/bpf/dispatcher.c
 +F:    kernel/bpf/trampoline.c
 +F:    include/linux/bpf*
 +F:    include/linux/filter.h
 +
 +BPF [BTF]
 +M:    Martin KaFai Lau <martin.lau@linux.dev>
 +L:    bpf@vger.kernel.org
 +S:    Maintained
 +F:    kernel/bpf/btf.c
 +F:    include/linux/btf*
 +
 +BPF [TRACING]
 +M:    Song Liu <song@kernel.org>
 +R:    Jiri Olsa <jolsa@kernel.org>
 +L:    bpf@vger.kernel.org
 +S:    Maintained
 +F:    kernel/trace/bpf_trace.c
 +F:    kernel/bpf/stackmap.c
 +
 +BPF [NETWORKING] (tc BPF, sock_addr)
 +M:    Martin KaFai Lau <martin.lau@linux.dev>
 +M:    Daniel Borkmann <daniel@iogearbox.net>
 +R:    John Fastabend <john.fastabend@gmail.com>
 +L:    bpf@vger.kernel.org
 +L:    netdev@vger.kernel.org
 +S:    Maintained
 +F:    net/core/filter.c
 +F:    net/sched/act_bpf.c
 +F:    net/sched/cls_bpf.c
 +
 +BPF [NETWORKING] (struct_ops, reuseport)
 +M:    Martin KaFai Lau <martin.lau@linux.dev>
 +L:    bpf@vger.kernel.org
 +L:    netdev@vger.kernel.org
 +S:    Maintained
 +F:    kernel/bpf/bpf_struct*
 +
 +BPF [SECURITY & LSM] (Security Audit and Enforcement using BPF)
  M:    KP Singh <kpsingh@kernel.org>
  R:    Florent Revest <revest@chromium.org>
  R:    Brendan Jackman <jackmanb@chromium.org>
@@@ -3797,64 -3736,6 +3797,64 @@@ F:    include/linux/bpf_lsm.
  F:    kernel/bpf/bpf_lsm.c
  F:    security/bpf/
  
 +BPF [STORAGE & CGROUPS]
 +M:    Martin KaFai Lau <martin.lau@linux.dev>
 +L:    bpf@vger.kernel.org
 +S:    Maintained
 +F:    kernel/bpf/cgroup.c
 +F:    kernel/bpf/*storage.c
 +F:    kernel/bpf/bpf_lru*
 +
 +BPF [RINGBUF]
 +M:    Andrii Nakryiko <andrii@kernel.org>
 +L:    bpf@vger.kernel.org
 +S:    Maintained
 +F:    kernel/bpf/ringbuf.c
 +
 +BPF [ITERATOR]
 +M:    Yonghong Song <yhs@fb.com>
 +L:    bpf@vger.kernel.org
 +S:    Maintained
 +F:    kernel/bpf/*iter.c
 +
 +BPF [L7 FRAMEWORK] (sockmap)
 +M:    John Fastabend <john.fastabend@gmail.com>
 +M:    Jakub Sitnicki <jakub@cloudflare.com>
 +L:    netdev@vger.kernel.org
 +L:    bpf@vger.kernel.org
 +S:    Maintained
 +F:    include/linux/skmsg.h
 +F:    net/core/skmsg.c
 +F:    net/core/sock_map.c
 +F:    net/ipv4/tcp_bpf.c
 +F:    net/ipv4/udp_bpf.c
 +F:    net/unix/unix_bpf.c
 +
 +BPF [LIBRARY] (libbpf)
 +M:    Andrii Nakryiko <andrii@kernel.org>
 +L:    bpf@vger.kernel.org
 +S:    Maintained
 +F:    tools/lib/bpf/
 +
 +BPF [TOOLING] (bpftool)
 +M:    Quentin Monnet <quentin@isovalent.com>
 +L:    bpf@vger.kernel.org
 +S:    Maintained
 +F:    kernel/bpf/disasm.*
 +F:    tools/bpf/bpftool/
 +
 +BPF [SELFTESTS] (Test Runners & Infrastructure)
 +M:    Andrii Nakryiko <andrii@kernel.org>
 +R:    Mykola Lysenko <mykolal@fb.com>
 +L:    bpf@vger.kernel.org
 +S:    Maintained
 +F:    tools/testing/selftests/bpf/
 +
 +BPF [MISC]
 +L:    bpf@vger.kernel.org
 +S:    Odd Fixes
 +K:    (?:\b|_)bpf(?:\b|_)
 +
  BROADCOM B44 10/100 ETHERNET DRIVER
  M:    Michael Chan <michael.chan@broadcom.com>
  L:    netdev@vger.kernel.org
@@@ -3872,39 -3753,24 +3872,39 @@@ F:   drivers/net/dsa/bcm_sf2
  F:    include/linux/dsa/brcm.h
  F:    include/linux/platform_data/b53.h
  
 +BROADCOM BCMBCA ARM ARCHITECTURE
 +M:    William Zhang <william.zhang@broadcom.com>
 +M:    Anand Gore <anand.gore@broadcom.com>
 +M:    Kursad Oney <kursad.oney@broadcom.com>
 +R:    Broadcom internal kernel review list <bcm-kernel-feedback-list@broadcom.com>
 +L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 +S:    Maintained
 +T:    git git://github.com/broadcom/stblinux.git
 +F:    Documentation/devicetree/bindings/arm/bcm/brcm,bcmbca.yaml
 +F:    arch/arm/boot/dts/bcm47622.dtsi
 +F:    arch/arm/boot/dts/bcm947622.dts
 +N:    bcmbca
 +N:    bcm[9]?47622
 +
  BROADCOM BCM2711/BCM2835 ARM ARCHITECTURE
 -M:    Nicolas Saenz Julienne <nsaenz@kernel.org>
 -R:    Broadcom Kernel Team <bcm-kernel-feedback-list@broadcom.com>
 +M:    Florian Fainelli <f.fainelli@gmail.com>
 +R:    Broadcom internal kernel review list <bcm-kernel-feedback-list@broadcom.com>
  L:    linux-rpi-kernel@lists.infradead.org (moderated for non-subscribers)
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Maintained
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/nsaenz/linux-rpi.git
 +T:    git git://github.com/broadcom/stblinux.git
  F:    Documentation/devicetree/bindings/pci/brcm,stb-pcie.yaml
  F:    drivers/pci/controller/pcie-brcmstb.c
  F:    drivers/staging/vc04_services
  N:    bcm2711
  N:    bcm283*
 +N:    raspberrypi
  
  BROADCOM BCM281XX/BCM11XXX/BCM216XX ARM ARCHITECTURE
  M:    Florian Fainelli <f.fainelli@gmail.com>
  M:    Ray Jui <rjui@broadcom.com>
  M:    Scott Branden <sbranden@broadcom.com>
 -R:    Broadcom Kernel Team <bcm-kernel-feedback-list@broadcom.com>
 +R:    Broadcom internal kernel review list <bcm-kernel-feedback-list@broadcom.com>
  S:    Maintained
  T:    git git://github.com/broadcom/mach-bcm
  F:    arch/arm/mach-bcm/
@@@ -3924,7 -3790,7 +3924,7 @@@ F:      arch/mips/include/asm/mach-bcm47xx/
  
  BROADCOM BCM4908 ETHERNET DRIVER
  M:    Rafał Miłecki <rafal@milecki.pl>
 -R:    Broadcom Kernel Team <bcm-kernel-feedback-list@broadcom.com>
 +R:    Broadcom internal kernel review list <bcm-kernel-feedback-list@broadcom.com>
  L:    netdev@vger.kernel.org
  S:    Maintained
  F:    Documentation/devicetree/bindings/net/brcm,bcm4908-enet.yaml
@@@ -3933,7 -3799,7 +3933,7 @@@ F:      drivers/net/ethernet/broadcom/unimac
  
  BROADCOM BCM4908 PINMUX DRIVER
  M:    Rafał Miłecki <rafal@milecki.pl>
 -R:    Broadcom Kernel Team <bcm-kernel-feedback-list@broadcom.com>
 +R:    Broadcom internal kernel review list <bcm-kernel-feedback-list@broadcom.com>
  L:    linux-gpio@vger.kernel.org
  S:    Maintained
  F:    Documentation/devicetree/bindings/pinctrl/brcm,bcm4908-pinctrl.yaml
@@@ -3943,7 -3809,7 +3943,7 @@@ BROADCOM BCM5301X ARM ARCHITECTUR
  M:    Florian Fainelli <f.fainelli@gmail.com>
  M:    Hauke Mehrtens <hauke@hauke-m.de>
  M:    Rafał Miłecki <zajec5@gmail.com>
 -R:    Broadcom Kernel Team <bcm-kernel-feedback-list@broadcom.com>
 +R:    Broadcom internal kernel review list <bcm-kernel-feedback-list@broadcom.com>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Maintained
  F:    arch/arm/boot/dts/bcm470*
@@@ -3954,7 -3820,7 +3954,7 @@@ F:      arch/arm/mach-bcm/bcm_5301x.
  BROADCOM BCM53573 ARM ARCHITECTURE
  M:    Florian Fainelli <f.fainelli@gmail.com>
  M:    Rafał Miłecki <rafal@milecki.pl>
 -R:    Broadcom Kernel Team <bcm-kernel-feedback-list@broadcom.com>
 +R:    Broadcom internal kernel review list <bcm-kernel-feedback-list@broadcom.com>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Maintained
  F:    arch/arm/boot/dts/bcm47189*
@@@ -3962,7 -3828,7 +3962,7 @@@ F:      arch/arm/boot/dts/bcm53573
  
  BROADCOM BCM63XX ARM ARCHITECTURE
  M:    Florian Fainelli <f.fainelli@gmail.com>
 -R:    Broadcom Kernel Team <bcm-kernel-feedback-list@broadcom.com>
 +R:    Broadcom internal kernel review list <bcm-kernel-feedback-list@broadcom.com>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Maintained
  T:    git git://github.com/broadcom/stblinux.git
@@@ -3976,7 -3842,7 +3976,7 @@@ F:      drivers/usb/gadget/udc/bcm63xx_udc.
  
  BROADCOM BCM7XXX ARM ARCHITECTURE
  M:    Florian Fainelli <f.fainelli@gmail.com>
 -R:    Broadcom Kernel Team <bcm-kernel-feedback-list@broadcom.com>
 +R:    Broadcom internal kernel review list <bcm-kernel-feedback-list@broadcom.com>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Maintained
  T:    git git://github.com/broadcom/stblinux.git
@@@ -3994,21 -3860,21 +3994,21 @@@ N:   bcm712
  BROADCOM BDC DRIVER
  M:    Al Cooper <alcooperx@gmail.com>
  L:    linux-usb@vger.kernel.org
 -R:    Broadcom Kernel Team <bcm-kernel-feedback-list@broadcom.com>
 +R:    Broadcom internal kernel review list <bcm-kernel-feedback-list@broadcom.com>
  S:    Maintained
  F:    Documentation/devicetree/bindings/usb/brcm,bdc.yaml
  F:    drivers/usb/gadget/udc/bdc/
  
  BROADCOM BMIPS CPUFREQ DRIVER
  M:    Markus Mayer <mmayer@broadcom.com>
 -R:    Broadcom Kernel Team <bcm-kernel-feedback-list@broadcom.com>
 +R:    Broadcom internal kernel review list <bcm-kernel-feedback-list@broadcom.com>
  L:    linux-pm@vger.kernel.org
  S:    Maintained
  F:    drivers/cpufreq/bmips-cpufreq.c
  
  BROADCOM BMIPS MIPS ARCHITECTURE
  M:    Florian Fainelli <f.fainelli@gmail.com>
 -R:    Broadcom Kernel Team <bcm-kernel-feedback-list@broadcom.com>
 +R:    Broadcom internal kernel review list <bcm-kernel-feedback-list@broadcom.com>
  L:    linux-mips@vger.kernel.org
  S:    Maintained
  T:    git git://github.com/broadcom/stblinux.git
@@@ -4076,14 -3942,14 +4076,14 @@@ F:   drivers/net/wireless/broadcom/brcm80
  BROADCOM BRCMSTB GPIO DRIVER
  M:    Doug Berger <opendmb@gmail.com>
  M:    Florian Fainelli <f.fainelli@gmail.com>
 -R:    Broadcom Kernel Team <bcm-kernel-feedback-list@broadcom.com>
 +R:    Broadcom internal kernel review list <bcm-kernel-feedback-list@broadcom.com>
  S:    Supported
  F:    Documentation/devicetree/bindings/gpio/brcm,brcmstb-gpio.yaml
  F:    drivers/gpio/gpio-brcmstb.c
  
  BROADCOM BRCMSTB I2C DRIVER
  M:    Kamal Dasu <kdasu.kdev@gmail.com>
 -R:    Broadcom Kernel Team <bcm-kernel-feedback-list@broadcom.com>
 +R:    Broadcom internal kernel review list <bcm-kernel-feedback-list@broadcom.com>
  L:    linux-i2c@vger.kernel.org
  S:    Supported
  F:    Documentation/devicetree/bindings/i2c/brcm,brcmstb-i2c.yaml
@@@ -4091,7 -3957,7 +4091,7 @@@ F:      drivers/i2c/busses/i2c-brcmstb.
  
  BROADCOM BRCMSTB UART DRIVER
  M:    Al Cooper <alcooperx@gmail.com>
 -R:    Broadcom Kernel Team <bcm-kernel-feedback-list@broadcom.com>
 +R:    Broadcom internal kernel review list <bcm-kernel-feedback-list@broadcom.com>
  L:    linux-serial@vger.kernel.org
  S:    Maintained
  F:    Documentation/devicetree/bindings/serial/brcm,bcm7271-uart.yaml
@@@ -4099,7 -3965,7 +4099,7 @@@ F:      drivers/tty/serial/8250/8250_bcm7271
  
  BROADCOM BRCMSTB USB EHCI DRIVER
  M:    Al Cooper <alcooperx@gmail.com>
 -R:    Broadcom Kernel Team <bcm-kernel-feedback-list@broadcom.com>
 +R:    Broadcom internal kernel review list <bcm-kernel-feedback-list@broadcom.com>
  L:    linux-usb@vger.kernel.org
  S:    Maintained
  F:    Documentation/devicetree/bindings/usb/brcm,bcm7445-ehci.yaml
@@@ -4107,7 -3973,7 +4107,7 @@@ F:      drivers/usb/host/ehci-brcm.
  
  BROADCOM BRCMSTB USB PIN MAP DRIVER
  M:    Al Cooper <alcooperx@gmail.com>
 -R:    Broadcom Kernel Team <bcm-kernel-feedback-list@broadcom.com>
 +R:    Broadcom internal kernel review list <bcm-kernel-feedback-list@broadcom.com>
  L:    linux-usb@vger.kernel.org
  S:    Maintained
  F:    Documentation/devicetree/bindings/usb/brcm,usb-pinmap.yaml
@@@ -4115,14 -3981,14 +4115,14 @@@ F:   drivers/usb/misc/brcmstb-usb-pinmap.
  
  BROADCOM BRCMSTB USB2 and USB3 PHY DRIVER
  M:    Al Cooper <alcooperx@gmail.com>
 -R:    Broadcom Kernel Team <bcm-kernel-feedback-list@broadcom.com>
 +R:    Broadcom internal kernel review list <bcm-kernel-feedback-list@broadcom.com>
  L:    linux-kernel@vger.kernel.org
  S:    Maintained
  F:    drivers/phy/broadcom/phy-brcm-usb*
  
  BROADCOM ETHERNET PHY DRIVERS
  M:    Florian Fainelli <f.fainelli@gmail.com>
 -R:    Broadcom Kernel Team <bcm-kernel-feedback-list@broadcom.com>
 +R:    Broadcom internal kernel review list <bcm-kernel-feedback-list@broadcom.com>
  L:    netdev@vger.kernel.org
  S:    Supported
  F:    Documentation/devicetree/bindings/net/broadcom-bcm87xx.txt
@@@ -4133,7 -3999,7 +4133,7 @@@ F:      include/linux/brcmphy.
  BROADCOM GENET ETHERNET DRIVER
  M:    Doug Berger <opendmb@gmail.com>
  M:    Florian Fainelli <f.fainelli@gmail.com>
 -R:    Broadcom Kernel Team <bcm-kernel-feedback-list@broadcom.com>
 +R:    Broadcom internal kernel review list <bcm-kernel-feedback-list@broadcom.com>
  L:    netdev@vger.kernel.org
  S:    Supported
  F:    Documentation/devicetree/bindings/net/brcm,bcmgenet.yaml
@@@ -4147,7 -4013,7 +4147,7 @@@ F:      include/linux/platform_data/mdio-bcm
  BROADCOM IPROC ARM ARCHITECTURE
  M:    Ray Jui <rjui@broadcom.com>
  M:    Scott Branden <sbranden@broadcom.com>
 -R:    Broadcom Kernel Team <bcm-kernel-feedback-list@broadcom.com>
 +R:    Broadcom internal kernel review list <bcm-kernel-feedback-list@broadcom.com>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Maintained
  T:    git git://github.com/broadcom/stblinux.git
@@@ -4175,7 -4041,7 +4175,7 @@@ N:      stingra
  
  BROADCOM IPROC GBIT ETHERNET DRIVER
  M:    Rafał Miłecki <rafal@milecki.pl>
 -R:    Broadcom Kernel Team <bcm-kernel-feedback-list@broadcom.com>
 +R:    Broadcom internal kernel review list <bcm-kernel-feedback-list@broadcom.com>
  L:    netdev@vger.kernel.org
  S:    Maintained
  F:    Documentation/devicetree/bindings/net/brcm,amac.yaml
@@@ -4184,7 -4050,7 +4184,7 @@@ F:      drivers/net/ethernet/broadcom/unimac
  
  BROADCOM KONA GPIO DRIVER
  M:    Ray Jui <rjui@broadcom.com>
 -R:    Broadcom Kernel Team <bcm-kernel-feedback-list@broadcom.com>
 +R:    Broadcom internal kernel review list <bcm-kernel-feedback-list@broadcom.com>
  S:    Supported
  F:    Documentation/devicetree/bindings/gpio/brcm,kona-gpio.txt
  F:    drivers/gpio/gpio-bcm-kona.c
@@@ -4217,7 -4083,7 +4217,7 @@@ F:      drivers/firmware/broadcom/
  BROADCOM PMB (POWER MANAGEMENT BUS) DRIVER
  M:    Rafał Miłecki <rafal@milecki.pl>
  M:    Florian Fainelli <f.fainelli@gmail.com>
 -R:    Broadcom Kernel Team <bcm-kernel-feedback-list@broadcom.com>
 +R:    Broadcom internal kernel review list <bcm-kernel-feedback-list@broadcom.com>
  L:    linux-pm@vger.kernel.org
  S:    Maintained
  T:    git git://github.com/broadcom/stblinux.git
@@@ -4233,7 -4099,7 +4233,7 @@@ F:      include/linux/bcma
  
  BROADCOM SPI DRIVER
  M:    Kamal Dasu <kdasu.kdev@gmail.com>
 -R:    Broadcom Kernel Team <bcm-kernel-feedback-list@broadcom.com>
 +R:    Broadcom internal kernel review list <bcm-kernel-feedback-list@broadcom.com>
  S:    Maintained
  F:    Documentation/devicetree/bindings/spi/brcm,spi-bcm-qspi.yaml
  F:    drivers/spi/spi-bcm-qspi.*
@@@ -4242,7 -4108,7 +4242,7 @@@ F:      drivers/spi/spi-iproc-qspi.
  
  BROADCOM STB AVS CPUFREQ DRIVER
  M:    Markus Mayer <mmayer@broadcom.com>
 -R:    Broadcom Kernel Team <bcm-kernel-feedback-list@broadcom.com>
 +R:    Broadcom internal kernel review list <bcm-kernel-feedback-list@broadcom.com>
  L:    linux-pm@vger.kernel.org
  S:    Maintained
  F:    Documentation/devicetree/bindings/cpufreq/brcm,stb-avs-cpu-freq.txt
@@@ -4250,7 -4116,7 +4250,7 @@@ F:      drivers/cpufreq/brcmstb
  
  BROADCOM STB AVS TMON DRIVER
  M:    Markus Mayer <mmayer@broadcom.com>
 -R:    Broadcom Kernel Team <bcm-kernel-feedback-list@broadcom.com>
 +R:    Broadcom internal kernel review list <bcm-kernel-feedback-list@broadcom.com>
  L:    linux-pm@vger.kernel.org
  S:    Maintained
  F:    Documentation/devicetree/bindings/thermal/brcm,avs-tmon.yaml
@@@ -4258,7 -4124,7 +4258,7 @@@ F:      drivers/thermal/broadcom/brcmstb
  
  BROADCOM STB DPFE DRIVER
  M:    Markus Mayer <mmayer@broadcom.com>
 -R:    Broadcom Kernel Team <bcm-kernel-feedback-list@broadcom.com>
 +R:    Broadcom internal kernel review list <bcm-kernel-feedback-list@broadcom.com>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Maintained
  F:    Documentation/devicetree/bindings/memory-controllers/brcm,dpfe-cpu.yaml
@@@ -4267,7 -4133,7 +4267,7 @@@ F:      drivers/memory/brcmstb_dpfe.
  BROADCOM STB NAND FLASH DRIVER
  M:    Brian Norris <computersforpeace@gmail.com>
  M:    Kamal Dasu <kdasu.kdev@gmail.com>
 -R:    Broadcom Kernel Team <bcm-kernel-feedback-list@broadcom.com>
 +R:    Broadcom internal kernel review list <bcm-kernel-feedback-list@broadcom.com>
  L:    linux-mtd@lists.infradead.org
  S:    Maintained
  F:    drivers/mtd/nand/raw/brcmnand/
@@@ -4277,7 -4143,7 +4277,7 @@@ BROADCOM STB PCIE DRIVE
  M:    Jim Quinlan <jim2101024@gmail.com>
  M:    Nicolas Saenz Julienne <nsaenz@kernel.org>
  M:    Florian Fainelli <f.fainelli@gmail.com>
 -R:    Broadcom Kernel Team <bcm-kernel-feedback-list@broadcom.com>
 +R:    Broadcom internal kernel review list <bcm-kernel-feedback-list@broadcom.com>
  L:    linux-pci@vger.kernel.org
  S:    Maintained
  F:    Documentation/devicetree/bindings/pci/brcm,stb-pcie.yaml
@@@ -4285,7 -4151,7 +4285,7 @@@ F:      drivers/pci/controller/pcie-brcmstb.
  
  BROADCOM SYSTEMPORT ETHERNET DRIVER
  M:    Florian Fainelli <f.fainelli@gmail.com>
 -R:    Broadcom Kernel Team <bcm-kernel-feedback-list@broadcom.com>
 +R:    Broadcom internal kernel review list <bcm-kernel-feedback-list@broadcom.com>
  L:    netdev@vger.kernel.org
  S:    Supported
  F:    drivers/net/ethernet/broadcom/bcmsysport.*
@@@ -4302,7 -4168,7 +4302,7 @@@ F:      drivers/net/ethernet/broadcom/tg3.
  
  BROADCOM VK DRIVER
  M:    Scott Branden <scott.branden@broadcom.com>
 -R:    Broadcom Kernel Team <bcm-kernel-feedback-list@broadcom.com>
 +R:    Broadcom internal kernel review list <bcm-kernel-feedback-list@broadcom.com>
  S:    Supported
  F:    drivers/misc/bcm-vk/
  F:    include/uapi/linux/misc/bcm_vk.h
@@@ -4520,6 -4386,7 +4520,6 @@@ F:      drivers/net/can
  F:    drivers/phy/phy-can-transceiver.c
  F:    include/linux/can/bittiming.h
  F:    include/linux/can/dev.h
 -F:    include/linux/can/led.h
  F:    include/linux/can/length.h
  F:    include/linux/can/platform/
  F:    include/linux/can/rx-offload.h
@@@ -4690,8 -4557,8 +4690,8 @@@ F:      drivers/power/supply/cw2015_battery.
  
  CEPH COMMON CODE (LIBCEPH)
  M:    Ilya Dryomov <idryomov@gmail.com>
 -M:    Jeff Layton <jlayton@kernel.org>
  M:    Xiubo Li <xiubli@redhat.com>
 +R:    Jeff Layton <jlayton@kernel.org>
  L:    ceph-devel@vger.kernel.org
  S:    Supported
  W:    http://ceph.com/
@@@ -4701,9 -4568,9 +4701,9 @@@ F:      include/linux/crush
  F:    net/ceph/
  
  CEPH DISTRIBUTED FILE SYSTEM CLIENT (CEPH)
 -M:    Jeff Layton <jlayton@kernel.org>
  M:    Xiubo Li <xiubli@redhat.com>
  M:    Ilya Dryomov <idryomov@gmail.com>
 +R:    Jeff Layton <jlayton@kernel.org>
  L:    ceph-devel@vger.kernel.org
  S:    Supported
  W:    http://ceph.com/
@@@ -4765,7 -4632,6 +4765,7 @@@ F:      Documentation/dev-tools/checkpatch.r
  
  CHINESE DOCUMENTATION
  M:    Alex Shi <alexs@kernel.org>
 +M:    Yanteng Si <siyanteng@loongson.cn>
  S:    Maintained
  F:    Documentation/translations/zh_CN/
  
@@@ -4839,12 -4705,10 +4839,12 @@@ CIRRUS LOGIC AUDIO CODEC DRIVER
  M:    James Schulman <james.schulman@cirrus.com>
  M:    David Rhodes <david.rhodes@cirrus.com>
  M:    Lucas Tanure <tanureal@opensource.cirrus.com>
 +M:    Richard Fitzgerald <rf@opensource.cirrus.com>
  L:    alsa-devel@alsa-project.org (moderated for non-subscribers)
  L:    patches@opensource.cirrus.com
  S:    Maintained
  F:    Documentation/devicetree/bindings/sound/cirrus,cs*
 +F:    include/dt-bindings/sound/cs*
  F:    sound/pci/hda/cs*
  F:    sound/soc/codecs/cs*
  
@@@ -5050,7 -4914,6 +5050,7 @@@ Q:      http://patchwork.kernel.org/project/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git
  F:    Documentation/devicetree/bindings/clock/
  F:    drivers/clk/
 +F:    include/dt-bindings/clock/
  F:    include/linux/clk-pr*
  F:    include/linux/clk/
  F:    include/linux/of_clk.h
@@@ -5101,7 -4964,7 +5101,7 @@@ COMPUTE EXPRESS LINK (CXL
  M:    Alison Schofield <alison.schofield@intel.com>
  M:    Vishal Verma <vishal.l.verma@intel.com>
  M:    Ira Weiny <ira.weiny@intel.com>
 -M:    Ben Widawsky <ben.widawsky@intel.com>
 +M:    Ben Widawsky <bwidawsk@kernel.org>
  M:    Dan Williams <dan.j.williams@intel.com>
  L:    linux-cxl@vger.kernel.org
  S:    Maintained
@@@ -5146,7 -5009,6 +5146,7 @@@ F:      Documentation/admin-guide/cgroup-v1
  F:    Documentation/admin-guide/cgroup-v2.rst
  F:    include/linux/cgroup*
  F:    kernel/cgroup/
 +F:    tools/testing/selftests/cgroup/
  
  CONTROL GROUP - BLOCK IO CONTROLLER (BLKIO)
  M:    Tejun Heo <tj@kernel.org>
@@@ -5175,15 -5037,11 +5175,15 @@@ M:   Johannes Weiner <hannes@cmpxchg.org
  M:    Michal Hocko <mhocko@kernel.org>
  M:    Roman Gushchin <roman.gushchin@linux.dev>
  M:    Shakeel Butt <shakeelb@google.com>
 +R:    Muchun Song <songmuchun@bytedance.com>
  L:    cgroups@vger.kernel.org
  L:    linux-mm@kvack.org
  S:    Maintained
  F:    mm/memcontrol.c
  F:    mm/swap_cgroup.c
 +F:    tools/testing/selftests/cgroup/memcg_protection.m
 +F:    tools/testing/selftests/cgroup/test_kmem.c
 +F:    tools/testing/selftests/cgroup/test_memcontrol.c
  
  CORETEMP HARDWARE MONITORING DRIVER
  M:    Fenghua Yu <fenghua.yu@intel.com>
@@@ -5205,6 -5063,12 +5205,6 @@@ S:     Maintaine
  F:    Documentation/hwmon/corsair-psu.rst
  F:    drivers/hwmon/corsair-psu.c
  
 -COSA/SRP SYNC SERIAL DRIVER
 -M:    Jan "Yenya" Kasprzak <kas@fi.muni.cz>
 -S:    Maintained
 -W:    http://www.fi.muni.cz/~kas/cosa/
 -F:    drivers/net/wan/cosa*
 -
  COUNTER SUBSYSTEM
  M:    William Breathitt Gray <vilhelm.gray@gmail.com>
  L:    linux-iio@vger.kernel.org
@@@ -5281,7 -5145,7 +5281,7 @@@ F:      arch/x86/kernel/cpuid.
  F:    arch/x86/kernel/msr.c
  
  CPUIDLE DRIVER - ARM BIG LITTLE
 -M:    Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
 +M:    Lorenzo Pieralisi <lpieralisi@kernel.org>
  M:    Daniel Lezcano <daniel.lezcano@linaro.org>
  L:    linux-pm@vger.kernel.org
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
@@@ -5301,7 -5165,7 +5301,7 @@@ F:      drivers/cpuidle/cpuidle-exynos.
  F:    include/linux/platform_data/cpuidle-exynos.h
  
  CPUIDLE DRIVER - ARM PSCI
 -M:    Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
 +M:    Lorenzo Pieralisi <lpieralisi@kernel.org>
  M:    Sudeep Holla <sudeep.holla@arm.com>
  L:    linux-pm@vger.kernel.org
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
@@@ -5386,14 -5250,6 +5386,14 @@@ T:    git git://linuxtv.org/media_tree.gi
  F:    Documentation/devicetree/bindings/media/allwinner,sun6i-a31-csi.yaml
  F:    drivers/media/platform/sunxi/sun6i-csi/
  
 +CTU CAN FD DRIVER
 +M:    Pavel Pisa <pisa@cmp.felk.cvut.cz>
 +M:    Ondrej Ille <ondrej.ille@gmail.com>
 +L:    linux-can@vger.kernel.org
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/net/can/ctu,ctucanfd.yaml
 +F:    drivers/net/can/ctucanfd/
 +
  CW1200 WLAN driver
  M:    Solomon Peachy <pizza@shaftnet.org>
  S:    Maintained
@@@ -6053,7 -5909,7 +6053,7 @@@ DMA MAPPING HELPER
  M:    Christoph Hellwig <hch@lst.de>
  M:    Marek Szyprowski <m.szyprowski@samsung.com>
  R:    Robin Murphy <robin.murphy@arm.com>
 -L:    iommu@lists.linux-foundation.org
 +L:    iommu@lists.linux.dev
  S:    Supported
  W:    http://git.infradead.org/users/hch/dma-mapping.git
  T:    git git://git.infradead.org/users/hch/dma-mapping.git
@@@ -6065,7 -5921,7 +6065,7 @@@ F:      kernel/dma
  
  DMA MAPPING BENCHMARK
  M:    Xiang Chen <chenxiang66@hisilicon.com>
 -L:    iommu@lists.linux-foundation.org
 +L:    iommu@lists.linux.dev
  F:    kernel/dma/map_benchmark.c
  F:    tools/testing/selftests/dma/
  
@@@ -6150,12 -6006,6 +6150,12 @@@ L:    linux-doc@vger.kernel.or
  S:    Maintained
  F:    Documentation/translations/it_IT
  
 +DOCUMENTATION/JAPANESE
 +R:    Akira Yokosawa <akiyks@gmail.com>
 +L:    linux-doc@vger.kernel.org
 +S:    Maintained
 +F:    Documentation/translations/ja_JP
 +
  DONGWOON DW9714 LENS VOICE COIL DRIVER
  M:    Sakari Ailus <sakari.ailus@linux.intel.com>
  L:    linux-media@vger.kernel.org
@@@ -6177,7 -6027,7 +6177,7 @@@ M:      Sakari Ailus <sakari.ailus@linux.int
  L:    linux-media@vger.kernel.org
  S:    Maintained
  T:    git git://linuxtv.org/media_tree.git
 -F:    Documentation/devicetree/bindings/media/i2c/dongwoon,dw9807-vcm.txt
 +F:    Documentation/devicetree/bindings/media/i2c/dongwoon,dw9807-vcm.yaml
  F:    drivers/media/i2c/dw9807-vcm.c
  
  DOUBLETALK DRIVER
@@@ -6422,9 -6272,8 +6422,9 @@@ F:      drivers/gpu/drm/tiny/panel-mipi-dbi.
  
  DRM DRIVER FOR MSM ADRENO GPU
  M:    Rob Clark <robdclark@gmail.com>
 -M:    Sean Paul <sean@poorly.run>
 -R:    Abhinav Kumar <quic_abhinavk@quicinc.com>
 +M:    Abhinav Kumar <quic_abhinavk@quicinc.com>
 +M:    Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
 +R:    Sean Paul <sean@poorly.run>
  L:    linux-arm-msm@vger.kernel.org
  L:    dri-devel@lists.freedesktop.org
  L:    freedreno@lists.freedesktop.org
@@@ -6477,11 -6326,6 +6477,11 @@@ S:    Maintaine
  F:    Documentation/devicetree/bindings/display/panel/olimex,lcd-olinuxino.yaml
  F:    drivers/gpu/drm/panel/panel-olimex-lcd-olinuxino.c
  
 +DRM DRIVER FOR PARADE PS8640 BRIDGE CHIP
 +R:    Douglas Anderson <dianders@chromium.org>
 +F:    Documentation/devicetree/bindings/display/bridge/ps8640.yaml
 +F:    drivers/gpu/drm/bridge/parade-ps8640.c
 +
  DRM DRIVER FOR PERVASIVE DISPLAYS REPAPER PANELS
  M:    Noralf Trønnes <noralf@tronnes.org>
  S:    Maintained
@@@ -6595,11 -6439,6 +6595,11 @@@ DRM DRIVER FOR TDFX VIDEO CARD
  S:    Orphan / Obsolete
  F:    drivers/gpu/drm/tdfx/
  
 +DRM DRIVER FOR TI SN65DSI86 BRIDGE CHIP
 +R:    Douglas Anderson <dianders@chromium.org>
 +F:    Documentation/devicetree/bindings/display/bridge/ti,sn65dsi86.yaml
 +F:    drivers/gpu/drm/bridge/ti-sn65dsi86.c
 +
  DRM DRIVER FOR TPO TPG110 PANELS
  M:    Linus Walleij <linus.walleij@linaro.org>
  S:    Maintained
@@@ -6719,7 -6558,6 +6719,7 @@@ R:      Jonas Karlman <jonas@kwiboo.se
  R:    Jernej Skrabec <jernej.skrabec@gmail.com>
  S:    Maintained
  T:    git git://anongit.freedesktop.org/drm/drm-misc
 +F:    Documentation/devicetree/bindings/display/bridge/
  F:    drivers/gpu/drm/bridge/
  
  DRM DRIVERS FOR EXYNOS
@@@ -7636,7 -7474,6 +7636,7 @@@ S:      Maintaine
  F:    Documentation/admin-guide/bootconfig.rst
  F:    fs/proc/bootconfig.c
  F:    include/linux/bootconfig.h
 +F:    lib/bootconfig-data.S
  F:    lib/bootconfig.c
  F:    tools/bootconfig/*
  F:    tools/bootconfig/scripts/*
@@@ -7649,7 -7486,7 +7649,7 @@@ F:      drivers/gpu/drm/exynos/exynos_dp
  
  EXYNOS SYSMMU (IOMMU) driver
  M:    Marek Szyprowski <m.szyprowski@samsung.com>
 -L:    iommu@lists.linux-foundation.org
 +L:    iommu@lists.linux.dev
  S:    Maintained
  F:    drivers/iommu/exynos-iommu.c
  
@@@ -7746,7 -7583,6 +7746,7 @@@ F:      include/uapi/scsi/fc
  
  FILE LOCKING (flock() and fcntl()/lockf())
  M:    Jeff Layton <jlayton@kernel.org>
 +M:    Chuck Lever <chuck.lever@oracle.com>
  L:    linux-fsdevel@vger.kernel.org
  S:    Maintained
  F:    fs/fcntl.c
@@@ -7831,7 -7667,6 +7831,7 @@@ F:      include/linux/arm_ffa.
  
  FIRMWARE LOADER (request_firmware)
  M:    Luis Chamberlain <mcgrof@kernel.org>
 +M:    Russ Weight <russell.h.weight@intel.com>
  L:    linux-kernel@vger.kernel.org
  S:    Maintained
  F:    Documentation/firmware_class/
@@@ -7900,7 -7735,7 +7900,7 @@@ R:      Tom Rix <trix@redhat.com
  L:    linux-fpga@vger.kernel.org
  S:    Maintained
  Q:    http://patchwork.kernel.org/project/linux-fpga/list/
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mdf/linux-fpga.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/fpga/linux-fpga.git
  F:    Documentation/devicetree/bindings/fpga/
  F:    Documentation/driver-api/fpga/
  F:    Documentation/fpga/
@@@ -8526,7 -8361,7 +8526,7 @@@ M:      Mika Westerberg <mika.westerberg@lin
  M:    Andy Shevchenko <andriy.shevchenko@linux.intel.com>
  L:    linux-gpio@vger.kernel.org
  L:    linux-acpi@vger.kernel.org
 -S:    Maintained
 +S:    Supported
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-gpio-intel.git
  F:    Documentation/firmware-guide/acpi/gpio-properties.rst
  F:    drivers/gpio/gpiolib-acpi.c
@@@ -8571,7 -8406,6 +8571,7 @@@ F:      Documentation/devicetree/bindings/gp
  F:    Documentation/driver-api/gpio/
  F:    drivers/gpio/
  F:    include/asm-generic/gpio.h
 +F:    include/dt-bindings/gpio/
  F:    include/linux/gpio.h
  F:    include/linux/gpio/
  F:    include/linux/of_gpio.h
@@@ -8735,6 -8569,17 +8735,6 @@@ L:     linux-efi@vger.kernel.or
  S:    Maintained
  F:    block/partitions/efi.*
  
 -H8/300 ARCHITECTURE
 -M:    Yoshinori Sato <ysato@users.sourceforge.jp>
 -L:    uclinux-h8-devel@lists.sourceforge.jp (moderated for non-subscribers)
 -S:    Maintained
 -W:    http://uclinux-h8.sourceforge.jp
 -T:    git git://git.sourceforge.jp/gitroot/uclinux-h8/linux.git
 -F:    arch/h8300/
 -F:    drivers/clk/h8300/
 -F:    drivers/clocksource/h8300_*.c
 -F:    drivers/irqchip/irq-renesas-h8*.c
 -
  HABANALABS PCI DRIVER
  M:    Oded Gabbay <ogabbay@kernel.org>
  S:    Supported
@@@ -8943,6 -8788,7 +8943,6 @@@ F:      kernel/time/timer_*.
  HIGH-SPEED SCC DRIVER FOR AX.25
  L:    linux-hams@vger.kernel.org
  S:    Orphan
 -F:    drivers/net/hamradio/dmascc.c
  F:    drivers/net/hamradio/scc.c
  
  HIGHPOINT ROCKETRAID 3xxx RAID DRIVER
@@@ -9178,16 -9024,8 +9178,16 @@@ L:    linux-input@vger.kernel.or
  S:    Maintained
  F:    drivers/input/touchscreen/htcpen.c
  
 +HTE SUBSYSTEM
 +M:    Dipen Patel <dipenp@nvidia.com>
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/timestamp/
 +F:    Documentation/driver-api/hte/
 +F:    drivers/hte/
 +F:    include/linux/hte.h
 +
  HTS221 TEMPERATURE-HUMIDITY IIO DRIVER
 -M:    Lorenzo Bianconi <lorenzo.bianconi83@gmail.com>
 +M:    Lorenzo Bianconi <lorenzo@kernel.org>
  L:    linux-iio@vger.kernel.org
  S:    Maintained
  W:    http://www.st.com/
@@@ -9200,20 -9038,16 +9200,20 @@@ S:   Orpha
  F:    Documentation/networking/device_drivers/ethernet/huawei/hinic.rst
  F:    drivers/net/ethernet/huawei/hinic/
  
 -HUGETLB FILESYSTEM
 +HUGETLB SUBSYSTEM
  M:    Mike Kravetz <mike.kravetz@oracle.com>
 +M:    Muchun Song <songmuchun@bytedance.com>
  L:    linux-mm@kvack.org
  S:    Maintained
  F:    Documentation/ABI/testing/sysfs-kernel-mm-hugepages
  F:    Documentation/admin-guide/mm/hugetlbpage.rst
  F:    Documentation/vm/hugetlbfs_reserv.rst
 +F:    Documentation/vm/vmemmap_dedup.rst
  F:    fs/hugetlbfs/
  F:    include/linux/hugetlb.h
  F:    mm/hugetlb.c
 +F:    mm/hugetlb_vmemmap.c
 +F:    mm/hugetlb_vmemmap.h
  
  HVA ST MEDIA DRIVER
  M:    Jean-Christophe Trotin <jean-christophe.trotin@foss.st.com>
@@@ -9225,7 -9059,6 +9225,7 @@@ F:      drivers/media/platform/st/sti/hv
  
  HWPOISON MEMORY FAILURE HANDLING
  M:    Naoya Horiguchi <naoya.horiguchi@nec.com>
 +R:    Miaohe Lin <linmiaohe@huawei.com>
  L:    linux-mm@kvack.org
  S:    Maintained
  F:    mm/hwpoison-inject.c
@@@ -9370,7 -9203,6 +9370,7 @@@ T:      git git://git.kernel.org/pub/scm/lin
  F:    Documentation/devicetree/bindings/i2c/i2c.txt
  F:    Documentation/i2c/
  F:    drivers/i2c/*
 +F:    include/dt-bindings/i2c/i2c.h
  F:    include/linux/i2c-dev.h
  F:    include/linux/i2c-smbus.h
  F:    include/linux/i2c.h
@@@ -9386,7 -9218,6 +9386,7 @@@ T:      git git://git.kernel.org/pub/scm/lin
  F:    Documentation/devicetree/bindings/i2c/
  F:    drivers/i2c/algos/
  F:    drivers/i2c/busses/
 +F:    include/dt-bindings/i2c/
  
  I2C-TAOS-EVM DRIVER
  M:    Jean Delvare <jdelvare@suse.com>
@@@ -9458,13 -9289,13 +9458,13 @@@ F:   drivers/i2c/i2c-stub.
  I3C DRIVER FOR CADENCE I3C MASTER IP
  M:    Przemysław Gaj <pgaj@cadence.com>
  S:    Maintained
 -F:    Documentation/devicetree/bindings/i3c/cdns,i3c-master.txt
 +F:    Documentation/devicetree/bindings/i3c/cdns,i3c-master.yaml
  F:    drivers/i3c/master/i3c-master-cdns.c
  
  I3C DRIVER FOR SYNOPSYS DESIGNWARE
  M:    Vitor Soares <vitor.soares@synopsys.com>
  S:    Maintained
 -F:    Documentation/devicetree/bindings/i3c/snps,dw-i3c-master.txt
 +F:    Documentation/devicetree/bindings/i3c/snps,dw-i3c-master.yaml
  F:    drivers/i3c/master/dw*
  
  I3C SUBSYSTEM
@@@ -9907,10 -9738,7 +9907,10 @@@ INTEL ASoC DRIVER
  M:    Cezary Rojewski <cezary.rojewski@intel.com>
  M:    Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
  M:    Liam Girdwood <liam.r.girdwood@linux.intel.com>
 -M:    Jie Yang <yang.jie@linux.intel.com>
 +M:    Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
 +M:    Bard Liao <yung-chuan.liao@linux.intel.com>
 +M:    Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
 +M:    Kai Vehmanen <kai.vehmanen@linux.intel.com>
  L:    alsa-devel@alsa-project.org (moderated for non-subscribers)
  S:    Supported
  F:    sound/soc/intel/
@@@ -10006,7 -9834,7 +10006,7 @@@ F:    drivers/video/fbdev/intelfb
  INTEL GPIO DRIVERS
  M:    Andy Shevchenko <andy@kernel.org>
  L:    linux-gpio@vger.kernel.org
 -S:    Maintained
 +S:    Supported
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-gpio-intel.git
  F:    drivers/gpio/gpio-ich.c
  F:    drivers/gpio/gpio-merrifield.c
@@@ -10073,7 -9901,7 +10073,7 @@@ F:    drivers/hid/intel-ish-hid
  INTEL IOMMU (VT-d)
  M:    David Woodhouse <dwmw2@infradead.org>
  M:    Lu Baolu <baolu.lu@linux.intel.com>
 -L:    iommu@lists.linux-foundation.org
 +L:    iommu@lists.linux.dev
  S:    Supported
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git
  F:    drivers/iommu/intel/
@@@ -10188,7 -10016,6 +10188,7 @@@ S:   Supporte
  F:    Documentation/driver-api/mei/*
  F:    drivers/misc/mei/
  F:    drivers/watchdog/mei_wdt.c
 +F:    include/linux/mei_aux.h
  F:    include/linux/mei_cl_bus.h
  F:    include/uapi/linux/mei.h
  F:    samples/mei/*
@@@ -10227,7 -10054,7 +10227,7 @@@ F:   drivers/platform/x86/intel/pmc
  
  INTEL PMIC GPIO DRIVERS
  M:    Andy Shevchenko <andy@kernel.org>
 -S:    Maintained
 +S:    Supported
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-gpio-intel.git
  F:    drivers/gpio/gpio-*cove.c
  
@@@ -10452,7 -10279,7 +10452,7 @@@ F:   include/linux/iomap.
  IOMMU DRIVERS
  M:    Joerg Roedel <joro@8bytes.org>
  M:    Will Deacon <will@kernel.org>
 -L:    iommu@lists.linux-foundation.org
 +L:    iommu@lists.linux.dev
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git
  F:    Documentation/devicetree/bindings/iommu/
@@@ -10846,7 -10673,6 +10846,7 @@@ W:   http://kernelnewbies.org/KernelJanit
  
  KERNEL NFSD, SUNRPC, AND LOCKD SERVERS
  M:    Chuck Lever <chuck.lever@oracle.com>
 +M:    Jeff Layton <jlayton@kernel.org>
  L:    linux-nfs@vger.kernel.org
  S:    Supported
  W:    http://nfs.sourceforge.net/
@@@ -10929,7 -10755,6 +10929,7 @@@ M:   Marc Zyngier <maz@kernel.org
  R:    James Morse <james.morse@arm.com>
  R:    Alexandru Elisei <alexandru.elisei@arm.com>
  R:    Suzuki K Poulose <suzuki.poulose@arm.com>
 +R:    Oliver Upton <oliver.upton@linux.dev>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  L:    kvmarm@lists.cs.columbia.edu (moderated for non-subscribers)
  S:    Maintained
@@@ -10971,7 -10796,6 +10971,7 @@@ T:   git git://github.com/kvm-riscv/linux
  F:    arch/riscv/include/asm/kvm*
  F:    arch/riscv/include/uapi/asm/kvm*
  F:    arch/riscv/kvm/
 +F:    tools/testing/selftests/kvm/*/riscv/
  
  KERNEL VIRTUAL MACHINE for s390 (KVM/s390)
  M:    Christian Borntraeger <borntraeger@linux.ibm.com>
@@@ -10986,61 -10810,35 +10986,61 @@@ F:        Documentation/virt/kvm/s390
  F:    arch/s390/include/asm/gmap.h
  F:    arch/s390/include/asm/kvm*
  F:    arch/s390/include/uapi/asm/kvm*
 +F:    arch/s390/include/uapi/asm/uvdevice.h
  F:    arch/s390/kernel/uv.c
  F:    arch/s390/kvm/
  F:    arch/s390/mm/gmap.c
 +F:    drivers/s390/char/uvdevice.c
 +F:    tools/testing/selftests/drivers/s390x/uvdevice/
  F:    tools/testing/selftests/kvm/*/s390x/
  F:    tools/testing/selftests/kvm/s390x/
  
  KERNEL VIRTUAL MACHINE FOR X86 (KVM/x86)
 +M:    Sean Christopherson <seanjc@google.com>
  M:    Paolo Bonzini <pbonzini@redhat.com>
 -R:    Sean Christopherson <seanjc@google.com>
 -R:    Vitaly Kuznetsov <vkuznets@redhat.com>
 -R:    Wanpeng Li <wanpengli@tencent.com>
 -R:    Jim Mattson <jmattson@google.com>
 -R:    Joerg Roedel <joro@8bytes.org>
  L:    kvm@vger.kernel.org
  S:    Supported
 -W:    http://www.linux-kvm.org
  T:    git git://git.kernel.org/pub/scm/virt/kvm/kvm.git
  F:    arch/x86/include/asm/kvm*
 -F:    arch/x86/include/asm/pvclock-abi.h
  F:    arch/x86/include/asm/svm.h
  F:    arch/x86/include/asm/vmx*.h
  F:    arch/x86/include/uapi/asm/kvm*
  F:    arch/x86/include/uapi/asm/svm.h
  F:    arch/x86/include/uapi/asm/vmx.h
 -F:    arch/x86/kernel/kvm.c
 -F:    arch/x86/kernel/kvmclock.c
  F:    arch/x86/kvm/
  F:    arch/x86/kvm/*/
  
 +KVM PARAVIRT (KVM/paravirt)
 +M:    Paolo Bonzini <pbonzini@redhat.com>
 +R:    Wanpeng Li <wanpengli@tencent.com>
 +R:    Vitaly Kuznetsov <vkuznets@redhat.com>
 +L:    kvm@vger.kernel.org
 +S:    Supported
 +T:    git git://git.kernel.org/pub/scm/virt/kvm/kvm.git
 +F:    arch/x86/kernel/kvm.c
 +F:    arch/x86/kernel/kvmclock.c
 +F:    arch/x86/include/asm/pvclock-abi.h
 +F:    include/linux/kvm_para.h
 +F:    include/uapi/linux/kvm_para.h
 +F:    include/uapi/asm-generic/kvm_para.h
 +F:    include/asm-generic/kvm_para.h
 +F:    arch/um/include/asm/kvm_para.h
 +F:    arch/x86/include/asm/kvm_para.h
 +F:    arch/x86/include/uapi/asm/kvm_para.h
 +
 +KVM X86 HYPER-V (KVM/hyper-v)
 +M:    Vitaly Kuznetsov <vkuznets@redhat.com>
 +M:    Sean Christopherson <seanjc@google.com>
 +M:    Paolo Bonzini <pbonzini@redhat.com>
 +L:    kvm@vger.kernel.org
 +S:    Supported
 +T:    git git://git.kernel.org/pub/scm/virt/kvm/kvm.git
 +F:    arch/x86/kvm/hyperv.*
 +F:    arch/x86/kvm/kvm_onhyperv.*
 +F:    arch/x86/kvm/svm/hyperv.*
 +F:    arch/x86/kvm/svm/svm_onhyperv.*
 +F:    arch/x86/kvm/vmx/evmcs.*
 +
  KERNFS
  M:    Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  M:    Tejun Heo <tj@kernel.org>
@@@ -11150,7 -10948,6 +11150,7 @@@ F:   drivers/tty/serial/kgdboc.
  F:    include/linux/kdb.h
  F:    include/linux/kgdb.h
  F:    kernel/debug/
 +F:    kernel/module/kdb.c
  
  KHADAS MCU MFD DRIVER
  M:    Neil Armstrong <narmstrong@baylibre.com>
@@@ -11219,6 -11016,20 +11219,6 @@@ S:  Maintaine
  F:    include/net/l3mdev.h
  F:    net/l3mdev
  
 -L7 BPF FRAMEWORK
 -M:    John Fastabend <john.fastabend@gmail.com>
 -M:    Daniel Borkmann <daniel@iogearbox.net>
 -M:    Jakub Sitnicki <jakub@cloudflare.com>
 -L:    netdev@vger.kernel.org
 -L:    bpf@vger.kernel.org
 -S:    Maintained
 -F:    include/linux/skmsg.h
 -F:    net/core/skmsg.c
 -F:    net/core/sock_map.c
 -F:    net/ipv4/tcp_bpf.c
 -F:    net/ipv4/udp_bpf.c
 -F:    net/unix/unix_bpf.c
 -
  LANDLOCK SECURITY MODULE
  M:    Mickaël Salaün <mic@digikod.net>
  L:    linux-security-module@vger.kernel.org
@@@ -11374,7 -11185,6 +11374,7 @@@ M:   Damien Le Moal <damien.lemoal@openso
  L:    linux-ide@vger.kernel.org
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/libata.git
 +F:    Documentation/ABI/testing/sysfs-ata
  F:    Documentation/devicetree/bindings/ata/
  F:    drivers/ata/
  F:    include/linux/ata.h
@@@ -11587,9 -11397,10 +11587,9 @@@ T:  git git://git.kernel.org/pub/scm/lin
  F:    Documentation/ABI/testing/sysfs-kernel-livepatch
  F:    Documentation/livepatch/
  F:    arch/powerpc/include/asm/livepatch.h
 -F:    arch/s390/include/asm/livepatch.h
 -F:    arch/x86/include/asm/livepatch.h
  F:    include/linux/livepatch.h
  F:    kernel/livepatch/
 +F:    kernel/module/livepatch.c
  F:    lib/livepatch/
  F:    samples/livepatch/
  F:    tools/testing/selftests/livepatch/
@@@ -11695,17 -11506,6 +11695,17 @@@ S: Maintaine
  F:    Documentation/devicetree/bindings/display/bridge/lontium,lt8912b.yaml
  F:    drivers/gpu/drm/bridge/lontium-lt8912b.c
  
 +LOONGARCH
 +M:    Huacai Chen <chenhuacai@kernel.org>
 +R:    WANG Xuerui <kernel@xen0n.name>
 +L:    loongarch@lists.linux.dev
 +S:    Maintained
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/chenhuacai/linux-loongson.git
 +F:    arch/loongarch/
 +F:    drivers/*/*loongarch*
 +F:    Documentation/loongarch/
 +F:    Documentation/translations/zh_CN/loongarch/
 +
  LSILOGIC MPT FUSION DRIVERS (FC/SAS/SPI)
  M:    Sathya Prakash <sathya.prakash@broadcom.com>
  M:    Sreekanth Reddy <sreekanth.reddy@broadcom.com>
@@@ -12069,13 -11869,6 +12069,13 @@@ S: Supporte
  F:    Documentation/devicetree/bindings/mmc/marvell,xenon-sdhci.yaml
  F:    drivers/mmc/host/sdhci-xenon*
  
 +MARVELL OCTEON ENDPOINT DRIVER
 +M:    Veerasenareddy Burru <vburru@marvell.com>
 +M:    Abhijit Ayarekar <aayarekar@marvell.com>
 +L:    netdev@vger.kernel.org
 +S:    Supported
 +F:    drivers/net/ethernet/marvell/octeon_ep
 +
  MATROX FRAMEBUFFER DRIVER
  L:    linux-fbdev@vger.kernel.org
  S:    Orphan
@@@ -12401,7 -12194,7 +12401,7 @@@ T:   git git://linuxtv.org/media_tree.gi
  F:    Documentation/admin-guide/media/imx7.rst
  F:    Documentation/devicetree/bindings/media/nxp,imx-mipi-csi2.yaml
  F:    Documentation/devicetree/bindings/media/nxp,imx7-csi.yaml
 -F:    drivers/media/platform/imx/imx-mipi-csis.c
 +F:    drivers/media/platform/nxp/imx-mipi-csis.c
  F:    drivers/staging/media/imx/imx7-media-csi.c
  
  MEDIA DRIVERS FOR HELENE
@@@ -12456,7 -12249,7 +12456,7 @@@ L:   linux-media@vger.kernel.or
  L:    linux-tegra@vger.kernel.org
  S:    Maintained
  T:    git git://linuxtv.org/media_tree.git
 -F:    Documentation/devicetree/bindings/media/nvidia,tegra-vde.txt
 +F:    Documentation/devicetree/bindings/media/nvidia,tegra-vde.yaml
  F:    drivers/media/platform/nvidia/tegra-vde/
  
  MEDIA DRIVERS FOR RENESAS - CEU
@@@ -12606,12 -12399,12 +12606,12 @@@ MEDIATEK I2C CONTROLLER DRIVE
  M:    Qii Wang <qii.wang@mediatek.com>
  L:    linux-i2c@vger.kernel.org
  S:    Maintained
 -F:    Documentation/devicetree/bindings/i2c/i2c-mt65xx.txt
 +F:    Documentation/devicetree/bindings/i2c/i2c-mt65xx.yaml
  F:    drivers/i2c/busses/i2c-mt65xx.c
  
  MEDIATEK IOMMU DRIVER
  M:    Yong Wu <yong.wu@mediatek.com>
 -L:    iommu@lists.linux-foundation.org
 +L:    iommu@lists.linux.dev
  L:    linux-mediatek@lists.infradead.org (moderated for non-subscribers)
  S:    Supported
  F:    Documentation/devicetree/bindings/iommu/mediatek*
@@@ -12619,9 -12412,10 +12619,9 @@@ F:  drivers/iommu/mtk_iommu
  F:    include/dt-bindings/memory/mt*-port.h
  
  MEDIATEK JPEG DRIVER
 -M:    Rick Chang <rick.chang@mediatek.com>
  M:    Bin Liu <bin.liu@mediatek.com>
  S:    Supported
 -F:    Documentation/devicetree/bindings/media/mediatek-jpeg-decoder.txt
 +F:    Documentation/devicetree/bindings/media/mediatek-jpeg-*.yaml
  F:    drivers/media/platform/mediatek/jpeg/
  
  MEDIATEK MDP DRIVER
@@@ -12637,7 -12431,7 +12637,7 @@@ MEDIATEK MEDIA DRIVE
  M:    Tiffany Lin <tiffany.lin@mediatek.com>
  M:    Andrew-CT Chen <andrew-ct.chen@mediatek.com>
  S:    Supported
 -F:    Documentation/devicetree/bindings/media/mediatek-vcodec.txt
 +F:    Documentation/devicetree/bindings/media/mediatek,vcodec*.yaml
  F:    Documentation/devicetree/bindings/media/mediatek-vpu.txt
  F:    drivers/media/platform/mediatek/vcodec/
  F:    drivers/media/platform/mediatek/vpu/
@@@ -12724,17 -12518,6 +12724,17 @@@ S: Maintaine
  F:    drivers/net/dsa/mt7530.*
  F:    net/dsa/tag_mtk.c
  
 +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>
 +R:    Ricardo Martinez <ricardo.martinez@linux.intel.com>
 +L:    netdev@vger.kernel.org
 +S:    Supported
 +F:    drivers/net/wwan/t7xx/
 +
  MEDIATEK USB3 DRD IP DRIVER
  M:    Chunfeng Yun <chunfeng.yun@mediatek.com>
  L:    linux-usb@vger.kernel.org
@@@ -12815,6 -12598,7 +12815,6 @@@ L:   netdev@vger.kernel.or
  S:    Supported
  W:    http://www.mellanox.com
  Q:    https://patchwork.kernel.org/project/netdevbpf/list/
 -F:    drivers/net/ethernet/mellanox/mlx5/core/accel/*
  F:    drivers/net/ethernet/mellanox/mlx5/core/en_accel/*
  F:    drivers/net/ethernet/mellanox/mlx5/core/fpga/*
  F:    include/linux/mlx5/mlx5_ifc_fpga.h
@@@ -12954,8 -12738,9 +12954,8 @@@ M:   Andrew Morton <akpm@linux-foundation
  L:    linux-mm@kvack.org
  S:    Maintained
  W:    http://www.linux-mm.org
 -T:    quilt https://ozlabs.org/~akpm/mmotm/
 -T:    quilt https://ozlabs.org/~akpm/mmots/
 -T:    git git://github.com/hnaz/linux-mm.git
 +T:    git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
 +T:    quilt git://git.kernel.org/pub/scm/linux/kernel/git/akpm/25-new
  F:    include/linux/gfp.h
  F:    include/linux/memory_hotplug.h
  F:    include/linux/mm.h
@@@ -12965,18 -12750,6 +12965,18 @@@ F: include/linux/vmalloc.
  F:    mm/
  F:    tools/testing/selftests/vm/
  
 +MEMORY HOT(UN)PLUG
 +M:    David Hildenbrand <david@redhat.com>
 +M:    Oscar Salvador <osalvador@suse.de>
 +L:    linux-mm@kvack.org
 +S:    Maintained
 +F:    Documentation/admin-guide/mm/memory-hotplug.rst
 +F:    Documentation/core-api/memory-hotplug.rst
 +F:    drivers/base/memory.c
 +F:    include/linux/memory_hotplug.h
 +F:    mm/memory_hotplug.c
 +F:    tools/testing/selftests/memory-hotplug/
 +
  MEMORY TECHNOLOGY DEVICES (MTD)
  M:    Miquel Raynal <miquel.raynal@bootlin.com>
  M:    Richard Weinberger <richard@nod.at>
@@@ -13064,7 -12837,7 +13064,7 @@@ F:   arch/arm64/boot/dts/marvell/armada-3
  
  MHI BUS
  M:    Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
 -R:    Hemant Kumar <hemantk@codeaurora.org>
 +R:    Hemant Kumar <quic_hemantk@quicinc.com>
  L:    mhi@lists.linux.dev
  L:    linux-arm-msm@vger.kernel.org
  S:    Maintained
@@@ -13174,13 -12947,6 +13174,13 @@@ F: drivers/net/dsa/microchip/
  F:    include/linux/platform_data/microchip-ksz.h
  F:    net/dsa/tag_ksz.c
  
 +MICROCHIP LAN87xx/LAN937x T1 PHY DRIVER
 +M:    Arun Ramadoss <arun.ramadoss@microchip.com>
 +R:    UNGLinuxDriver@microchip.com
 +L:    netdev@vger.kernel.org
 +S:    Maintained
 +F:    drivers/net/phy/microchip_t1.c
 +
  MICROCHIP LAN743X ETHERNET DRIVER
  M:    Bryan Whitehead <bryan.whitehead@microchip.com>
  M:    UNGLinuxDriver@microchip.com
@@@ -13234,7 -13000,7 +13234,7 @@@ M:   Claudiu Beznea <claudiu.beznea@micro
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  L:    linux-pwm@vger.kernel.org
  S:    Supported
 -F:    Documentation/devicetree/bindings/pwm/atmel-pwm.txt
 +F:    Documentation/devicetree/bindings/pwm/atmel,at91sam-pwm.yaml
  F:    drivers/pwm/pwm-atmel.c
  
  MICROCHIP SAMA5D2-COMPATIBLE ADC DRIVER
@@@ -13542,7 -13308,7 +13542,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/module.h
 -F:    kernel/module.c
 +F:    kernel/module/
  
  MONOLITHIC POWER SYSTEM PMIC DRIVER
  M:    Saravanan Sekar <sravanhome@gmail.com>
@@@ -13573,7 -13339,7 +13573,7 @@@ F:   drivers/net/phy/motorcomm.
  MOXA SMARTIO/INDUSTIO/INTELLIO SERIAL CARD
  M:    Jiri Slaby <jirislaby@kernel.org>
  S:    Maintained
 -F:    Documentation/driver-api/serial/moxa-smartio.rst
 +F:    Documentation/driver-api/tty/moxa-smartio.rst
  F:    drivers/tty/mxser.*
  
  MR800 AVERMEDIA USB FM RADIO DRIVER
@@@ -13921,7 -13687,6 +13921,7 @@@ T:   git git://git.kernel.org/pub/scm/lin
  F:    Documentation/devicetree/bindings/net/
  F:    drivers/connector/
  F:    drivers/net/
 +F:    include/dt-bindings/net/
  F:    include/linux/etherdevice.h
  F:    include/linux/fcdevice.h
  F:    include/linux/fddidevice.h
@@@ -14054,7 -13819,6 +14054,7 @@@ F:   include/net/mptcp.
  F:    include/trace/events/mptcp.h
  F:    include/uapi/linux/mptcp.h
  F:    net/mptcp/
 +F:    tools/testing/selftests/bpf/*/*mptcp*.c
  F:    tools/testing/selftests/net/mptcp/
  
  NETWORKING [TCP]
@@@ -14073,6 -13837,7 +14073,6 @@@ F:   net/ipv6/tcp*.
  NETWORKING [TLS]
  M:    Boris Pismenny <borisp@nvidia.com>
  M:    John Fastabend <john.fastabend@gmail.com>
 -M:    Daniel Borkmann <daniel@iogearbox.net>
  M:    Jakub Kicinski <kuba@kernel.org>
  L:    netdev@vger.kernel.org
  S:    Maintained
@@@ -14381,7 -14146,7 +14381,7 @@@ F:   drivers/iio/gyro/fxas21002c_i2c.
  F:    drivers/iio/gyro/fxas21002c_spi.c
  
  NXP i.MX CLOCK DRIVERS
 -M:    Abel Vesa <abel.vesa@nxp.com>
 +M:    Abel Vesa <abelvesa@kernel.org>
  L:    linux-clk@vger.kernel.org
  L:    linux-imx@nxp.com
  S:    Maintained
@@@ -14469,8 -14234,9 +14469,8 @@@ F:   Documentation/devicetree/bindings/so
  F:    sound/soc/codecs/tfa989x.c
  
  NXP-NCI NFC DRIVER
 -R:    Charles Gorand <charles.gorand@effinnov.com>
  L:    linux-nfc@lists.01.org (subscribers-only)
 -S:    Supported
 +S:    Orphan
  F:    Documentation/devicetree/bindings/net/nfc/nxp,nci.yaml
  F:    drivers/nfc/nxp-nci
  
@@@ -14480,7 -14246,7 +14480,7 @@@ R:   NXP Linux Team <linux-imx@nxp.com
  L:    linux-media@vger.kernel.org
  S:    Maintained
  F:    Documentation/devicetree/bindings/media/nxp,imx8-jpeg.yaml
 -F:    drivers/media/platform/imx-jpeg
 +F:    drivers/media/platform/nxp/imx-jpeg
  
  NZXT-KRAKEN2 HARDWARE MONITORING DRIVER
  M:    Jonas Malaco <jonas@protocubo.io>
@@@ -14678,7 -14444,6 +14678,7 @@@ F:   arch/arm/boot/dts/am335x-nano.dt
  
  OMAP1 SUPPORT
  M:    Aaro Koskinen <aaro.koskinen@iki.fi>
 +M:    Janusz Krzysztofik <jmkrzyszt@gmail.com>
  M:    Tony Lindgren <tony@atomide.com>
  L:    linux-omap@vger.kernel.org
  S:    Maintained
@@@ -14988,7 -14753,6 +14988,7 @@@ F:   include/dt-bindings
  
  OPENCOMPUTE PTP CLOCK DRIVER
  M:    Jonathan Lemon <jonathan.lemon@gmail.com>
 +M:    Vadim Fedorenko <vadfed@fb.com>
  L:    netdev@vger.kernel.org
  S:    Maintained
  F:    drivers/ptp/ptp_ocp.c
@@@ -15115,19 -14879,6 +15115,19 @@@ F: Documentation/core-api/padata.rs
  F:    include/linux/padata.h
  F:    kernel/padata.c
  
 +PAGE CACHE
 +M:    Matthew Wilcox (Oracle) <willy@infradead.org>
 +L:    linux-fsdevel@vger.kernel.org
 +S:    Supported
 +T:    git git://git.infradead.org/users/willy/pagecache.git
 +F:    Documentation/filesystems/locking.rst
 +F:    Documentation/filesystems/vfs.rst
 +F:    include/linux/pagemap.h
 +F:    mm/filemap.c
 +F:    mm/page-writeback.c
 +F:    mm/readahead.c
 +F:    mm/truncate.c
 +
  PAGE POOL
  M:    Jesper Dangaard Brouer <hawk@kernel.org>
  M:    Ilias Apalodimas <ilias.apalodimas@linaro.org>
@@@ -15456,7 -15207,7 +15456,7 @@@ F:   drivers/pci/controller/pci-v3-semi.
  
  PCI ENDPOINT SUBSYSTEM
  M:    Kishon Vijay Abraham I <kishon@ti.com>
 -M:    Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
 +M:    Lorenzo Pieralisi <lpieralisi@kernel.org>
  R:    Krzysztof Wilczyński <kw@linux.com>
  L:    linux-pci@vger.kernel.org
  S:    Supported
@@@ -15519,7 -15270,7 +15519,7 @@@ F:   Documentation/devicetree/bindings/pc
  F:    drivers/pci/controller/pci-xgene-msi.c
  
  PCI NATIVE HOST BRIDGE AND ENDPOINT DRIVERS
 -M:    Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
 +M:    Lorenzo Pieralisi <lpieralisi@kernel.org>
  R:    Rob Herring <robh@kernel.org>
  R:    Krzysztof Wilczyński <kw@linux.com>
  L:    linux-pci@vger.kernel.org
@@@ -15660,7 -15411,7 +15660,7 @@@ PCIE DRIVER FOR SOCIONEXT UNIPHIE
  M:    Kunihiko Hayashi <hayashi.kunihiko@socionext.com>
  L:    linux-pci@vger.kernel.org
  S:    Maintained
 -F:    Documentation/devicetree/bindings/pci/uniphier-pcie*
 +F:    Documentation/devicetree/bindings/pci/socionext,uniphier-pcie*
  F:    drivers/pci/controller/dwc/pcie-uniphier*
  
  PCIE DRIVER FOR ST SPEAR13XX
@@@ -15859,7 -15610,7 +15859,7 @@@ F:   drivers/pinctrl/freescale
  PIN CONTROLLER - INTEL
  M:    Mika Westerberg <mika.westerberg@linux.intel.com>
  M:    Andy Shevchenko <andy@kernel.org>
 -S:    Maintained
 +S:    Supported
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/intel.git
  F:    drivers/pinctrl/intel/
  
@@@ -15953,14 -15704,6 +15953,14 @@@ S: Maintaine
  F:    Documentation/devicetree/bindings/iio/chemical/plantower,pms7003.yaml
  F:    drivers/iio/chemical/pms7003.c
  
 +PLATFORM FEATURE INFRASTRUCTURE
 +M:    Juergen Gross <jgross@suse.com>
 +S:    Maintained
 +F:    arch/*/include/asm/platform-feature.h
 +F:    include/asm-generic/platform-feature.h
 +F:    include/linux/platform-feature.h
 +F:    kernel/platform-feature.c
 +
  PLDMFW LIBRARY
  M:    Jacob Keller <jacob.e.keller@intel.com>
  S:    Maintained
@@@ -16080,7 -15823,7 +16080,7 @@@ F:   include/linux/dtpm.
  
  POWER STATE COORDINATION INTERFACE (PSCI)
  M:    Mark Rutland <mark.rutland@arm.com>
 -M:    Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
 +M:    Lorenzo Pieralisi <lpieralisi@kernel.org>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Maintained
  F:    drivers/firmware/psci/
@@@ -16168,9 -15911,7 +16168,9 @@@ F:   kernel/printk
  PRINTK INDEXING
  R:    Chris Down <chris@chrisdown.name>
  S:    Maintained
 +F:    Documentation/core-api/printk-index.rst
  F:    kernel/printk/index.c
 +K:    printk_index
  
  PROC FILESYSTEM
  L:    linux-kernel@vger.kernel.org
@@@ -16274,6 -16015,7 +16274,6 @@@ F:   include/asm-generic/syscall.
  F:    include/linux/ptrace.h
  F:    include/linux/regset.h
  F:    include/uapi/linux/ptrace.h
 -F:    include/uapi/linux/ptrace.h
  F:    kernel/ptrace.c
  
  PULSE8-CEC DRIVER
@@@ -16284,12 -16026,6 +16284,12 @@@ T: git git://linuxtv.org/media_tree.gi
  F:    Documentation/admin-guide/media/pulse8-cec.rst
  F:    drivers/media/cec/usb/pulse8/
  
 +PURELIFI PLFXLC DRIVER
 +M:    Srinivasan Raju <srini.raju@purelifi.com>
 +L:    linux-wireless@vger.kernel.org
 +S:    Supported
 +F:    drivers/net/wireless/purelifi/plfxlc/
 +
  PVRUSB2 VIDEO4LINUX DRIVER
  M:    Mike Isely <isely@pobox.com>
  L:    pvrusb2@isely.net       (subscribers-only)
@@@ -16381,7 -16117,7 +16381,7 @@@ F:   drivers/crypto/qat
  
  QCOM AUDIO (ASoC) DRIVERS
  M:    Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
 -M:    Banajit Goswami <bgoswami@codeaurora.org>
 +M:    Banajit Goswami <bgoswami@quicinc.com>
  L:    alsa-devel@alsa-project.org (moderated for non-subscribers)
  S:    Supported
  F:    sound/soc/codecs/lpass-va-macro.c
@@@ -16608,7 -16344,7 +16608,7 @@@ F:   Documentation/devicetree/bindings/op
  F:    drivers/cpufreq/qcom-cpufreq-nvmem.c
  
  QUALCOMM CRYPTO DRIVERS
 -M:    Thara Gopinath <thara.gopinath@linaro.org>
 +M:    Thara Gopinath <thara.gopinath@gmail.com>
  L:    linux-crypto@vger.kernel.org
  L:    linux-arm-msm@vger.kernel.org
  S:    Maintained
@@@ -16662,7 -16398,7 +16662,7 @@@ F:   drivers/i2c/busses/i2c-qcom-cci.
  
  QUALCOMM IOMMU
  M:    Rob Clark <robdclark@gmail.com>
 -L:    iommu@lists.linux-foundation.org
 +L:    iommu@lists.linux.dev
  L:    linux-arm-msm@vger.kernel.org
  S:    Maintained
  F:    drivers/iommu/arm/arm-smmu/qcom_iommu.c
@@@ -16718,7 -16454,7 +16718,7 @@@ F:   include/linux/if_rmnet.
  
  QUALCOMM TSENS THERMAL DRIVER
  M:    Amit Kucheria <amitk@kernel.org>
 -M:    Thara Gopinath <thara.gopinath@linaro.org>
 +M:    Thara Gopinath <thara.gopinath@gmail.com>
  L:    linux-pm@vger.kernel.org
  L:    linux-arm-msm@vger.kernel.org
  S:    Maintained
@@@ -16757,7 -16493,6 +16757,7 @@@ S:   Supporte
  T:    git https://gitlab.freedesktop.org/agd5f/linux.git
  B:    https://gitlab.freedesktop.org/drm/amd/-/issues
  C:    irc://irc.oftc.net/radeon
 +F:    Documentation/gpu/amdgpu/
  F:    drivers/gpu/drm/amd/
  F:    drivers/gpu/drm/radeon/
  F:    include/uapi/drm/amdgpu_drm.h
@@@ -16822,13 -16557,6 +16822,13 @@@ L: linux-mips@vger.kernel.or
  S:    Maintained
  F:    arch/mips/boot/dts/ralink/mt7621*
  
 +RALINK PINCTRL DRIVER
 +M:    Arınç ÜNAL <arinc.unal@arinc9.com>
 +M:    Sergio Paracuellos <sergio.paracuellos@gmail.com>
 +L:    linux-mips@vger.kernel.org
 +S:    Maintained
 +F:    drivers/pinctrl/ralink/
 +
  RALINK RT2X00 WIRELESS LAN DRIVER
  M:    Stanislaw Gruszka <stf_xl@wp.pl>
  M:    Helmut Schaa <helmut.schaa@googlemail.com>
@@@ -17175,14 -16903,6 +17175,14 @@@ S: Supporte
  F:    Documentation/devicetree/bindings/iio/adc/renesas,rzg2l-adc.yaml
  F:    drivers/iio/adc/rzg2l_adc.c
  
 +RENESAS RZ/N1 RTC CONTROLLER DRIVER
 +M:    Miquel Raynal <miquel.raynal@bootlin.com>
 +L:    linux-rtc@vger.kernel.org
 +L:    linux-renesas-soc@vger.kernel.org
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/rtc/renesas,rzn1-rtc.yaml
 +F:    drivers/rtc/rtc-rzn1.c
 +
  RENESAS R-CAR GEN3 & RZ/N1 NAND CONTROLLER DRIVER
  M:    Miquel Raynal <miquel.raynal@bootlin.com>
  L:    linux-mtd@lists.infradead.org
@@@ -17892,7 -17612,6 +17892,7 @@@ T:   git git://git.kernel.org/pub/scm/lin
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git
  F:    Documentation/devicetree/bindings/scsi/
  F:    drivers/scsi/
 +F:    drivers/ufs/
  F:    include/scsi/
  
  SCSI TAPE DRIVER
@@@ -17987,7 -17706,7 +17987,7 @@@ K:   \bTIF_SECCOMP\
  
  SECURE DIGITAL HOST CONTROLLER INTERFACE (SDHCI) Broadcom BRCMSTB DRIVER
  M:    Al Cooper <alcooperx@gmail.com>
 -R:    Broadcom Kernel Team <bcm-kernel-feedback-list@broadcom.com>
 +R:    Broadcom internal kernel review list <bcm-kernel-feedback-list@broadcom.com>
  L:    linux-mmc@vger.kernel.org
  S:    Maintained
  F:    drivers/mmc/host/sdhci-brcmstb*
@@@ -18175,7 -17894,6 +18175,7 @@@ F:   drivers/misc/sgi-xp
  
  SHARED MEMORY COMMUNICATIONS (SMC) SOCKETS
  M:    Karsten Graul <kgraul@linux.ibm.com>
 +M:    Wenjia Zhang <wenjia@linux.ibm.com>
  L:    linux-s390@vger.kernel.org
  S:    Supported
  W:    http://www.ibm.com/developerworks/linux/linux390/
@@@ -18319,8 -18037,8 +18319,8 @@@ F:   drivers/platform/x86/touchscreen_dmi
  SILICON LABS WIRELESS DRIVERS (for WFxxx series)
  M:    Jérôme Pouiller <jerome.pouiller@silabs.com>
  S:    Supported
 -F:    Documentation/devicetree/bindings/staging/net/wireless/silabs,wfx.yaml
 -F:    drivers/staging/wfx/
 +F:    Documentation/devicetree/bindings/net/wireless/silabs,wfx.yaml
 +F:    drivers/net/wireless/silabs/wfx/
  
  SILICON MOTION SM712 FRAME BUFFER DRIVER
  M:    Sudip Mukherjee <sudipm.mukherjee@gmail.com>
@@@ -18433,7 -18151,6 +18433,7 @@@ M:   Joonsoo Kim <iamjoonsoo.kim@lge.com
  M:    Andrew Morton <akpm@linux-foundation.org>
  M:    Vlastimil Babka <vbabka@suse.cz>
  R:    Roman Gushchin <roman.gushchin@linux.dev>
 +R:    Hyeonggon Yoo <42.hyeyoo@gmail.com>
  L:    linux-mm@kvack.org
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/vbabka/slab.git
@@@ -18469,7 -18186,7 +18469,7 @@@ F:   drivers/net/ethernet/smsc/smc91x.
  
  SECURE MONITOR CALL(SMC) CALLING CONVENTION (SMCCC)
  M:    Mark Rutland <mark.rutland@arm.com>
 -M:    Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
 +M:    Lorenzo Pieralisi <lpieralisi@kernel.org>
  M:    Sudeep Holla <sudeep.holla@arm.com>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Maintained
@@@ -18808,10 -18525,8 +18808,10 @@@ F: sound/soc
  SOUND - SOUND OPEN FIRMWARE (SOF) DRIVERS
  M:    Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
  M:    Liam Girdwood <lgirdwood@gmail.com>
 +M:    Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
 +M:    Bard Liao <yung-chuan.liao@linux.intel.com>
  M:    Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
 -M:    Kai Vehmanen <kai.vehmanen@linux.intel.com>
 +R:    Kai Vehmanen <kai.vehmanen@linux.intel.com>
  M:    Daniel Baluta <daniel.baluta@nxp.com>
  L:    sound-open-firmware@alsa-project.org (moderated for non-subscribers)
  S:    Supported
@@@ -18968,7 -18683,7 +18968,7 @@@ S:   Maintaine
  F:    arch/alpha/kernel/srm_env.c
  
  ST LSM6DSx IMU IIO DRIVER
 -M:    Lorenzo Bianconi <lorenzo.bianconi83@gmail.com>
 +M:    Lorenzo Bianconi <lorenzo@kernel.org>
  L:    linux-iio@vger.kernel.org
  S:    Maintained
  W:    http://www.st.com/
@@@ -19209,26 -18924,12 +19209,26 @@@ L:        netdev@vger.kernel.or
  S:    Maintained
  F:    drivers/net/ethernet/dlink/sundance.c
  
 +SUNPLUS ETHERNET DRIVER
 +M:    Wells Lu <wellslutw@gmail.com>
 +L:    netdev@vger.kernel.org
 +S:    Maintained
 +W:    https://sunplus.atlassian.net/wiki/spaces/doc/overview
 +F:    Documentation/devicetree/bindings/net/sunplus,sp7021-emac.yaml
 +F:    drivers/net/ethernet/sunplus/
 +
  SUNPLUS OCOTP DRIVER
  M:    Vincent Shih <vincent.sunplus@gmail.com>
  S:    Maintained
  F:    Documentation/devicetree/bindings/nvmem/sunplus,sp7021-ocotp.yaml
  F:    drivers/nvmem/sunplus-ocotp.c
  
 +SUNPLUS PWM DRIVER
 +M:    Hammer Hsieh <hammerh0314@gmail.com>
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/pwm/sunplus,sp7021-pwm.yaml
 +F:    drivers/pwm/pwm-sunplus.c
 +
  SUNPLUS RTC DRIVER
  M:    Vincent Shih <vincent.sunplus@gmail.com>
  L:    linux-rtc@vger.kernel.org
@@@ -19249,13 -18950,6 +19249,13 @@@ S: Maintaine
  F:    Documentation/devicetree/bindings/serial/sunplus,sp7021-uart.yaml
  F:    drivers/tty/serial/sunplus-uart.c
  
 +SUNPLUS WATCHDOG DRIVER
 +M:    Xiantao Hu <xt.hu@cqplus1.com>
 +L:    linux-watchdog@vger.kernel.org
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/watchdog/sunplus,sp7021-wdt.yaml
 +F:    drivers/watchdog/sunplus_wdt.c
 +
  SUPERH
  M:    Yoshinori Sato <ysato@users.sourceforge.jp>
  M:    Rich Felker <dalias@libc.org>
@@@ -19290,7 -18984,7 +19290,7 @@@ F:   arch/x86/boot/video
  
  SWIOTLB SUBSYSTEM
  M:    Christoph Hellwig <hch@infradead.org>
 -L:    iommu@lists.linux-foundation.org
 +L:    iommu@lists.linux.dev
  S:    Supported
  W:    http://git.infradead.org/users/hch/dma-mapping.git
  T:    git git://git.infradead.org/users/hch/dma-mapping.git
@@@ -19360,7 -19054,7 +19360,7 @@@ F:   arch/arc/plat-axs10
  SYNOPSYS AXS10x RESET CONTROLLER DRIVER
  M:    Eugeniy Paltsev <Eugeniy.Paltsev@synopsys.com>
  S:    Supported
 -F:    Documentation/devicetree/bindings/reset/snps,axs10x-reset.txt
 +F:    Documentation/devicetree/bindings/reset/snps,axs10x-reset.yaml
  F:    drivers/reset/reset-axs10x.c
  
  SYNOPSYS CREG GPIO DRIVER
@@@ -19401,7 -19095,6 +19401,7 @@@ SYNOPSYS DESIGNWARE DMAC DRIVE
  M:    Viresh Kumar <vireshk@kernel.org>
  R:    Andy Shevchenko <andriy.shevchenko@linux.intel.com>
  S:    Maintained
 +F:    Documentation/devicetree/bindings/dma/renesas,rzn1-dmamux.yaml
  F:    Documentation/devicetree/bindings/dma/snps,dma-spear1340.yaml
  F:    drivers/dma/dw/
  F:    include/dt-bindings/dma/dw-dmac.h
@@@ -19428,7 -19121,7 +19428,7 @@@ R:   Andy Shevchenko <andriy.shevchenko@l
  R:    Mika Westerberg <mika.westerberg@linux.intel.com>
  R:    Jan Dabros <jsd@semihalf.com>
  L:    linux-i2c@vger.kernel.org
 -S:    Maintained
 +S:    Supported
  F:    drivers/i2c/busses/i2c-designware-*
  
  SYNOPSYS DESIGNWARE MMC/SD/SDIO DRIVER
@@@ -19893,6 -19586,7 +19893,7 @@@ F:   Documentation/ABI/testing/sysfs-clas
  F:    Documentation/devicetree/bindings/thermal/
  F:    Documentation/driver-api/thermal/
  F:    drivers/thermal/
+ F:    include/dt-bindings/thermal/
  F:    include/linux/cpu_cooling.h
  F:    include/linux/thermal.h
  F:    include/uapi/linux/thermal.h
@@@ -20320,8 -20014,8 +20321,8 @@@ M:   Ingo Molnar <mingo@redhat.com
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace.git
  F:    Documentation/trace/ftrace.rst
 -F:    arch/*/*/*/ftrace.h
 -F:    arch/*/kernel/ftrace.c
 +F:    arch/*/*/*/*ftrace*
 +F:    arch/*/*/*ftrace*
  F:    fs/tracefs/
  F:    include/*/ftrace.h
  F:    include/linux/trace*.h
@@@ -20552,28 -20246,35 +20553,28 @@@ F:        drivers/cdrom/cdrom.
  F:    include/linux/cdrom.h
  F:    include/uapi/linux/cdrom.h
  
 -UNISYS S-PAR DRIVERS
 -M:    David Kershner <david.kershner@unisys.com>
 -L:    sparmaintainer@unisys.com (Unisys internal)
 -S:    Supported
 -F:    drivers/staging/unisys/
 -F:    drivers/visorbus/
 -F:    include/linux/visorbus.h
 -
  UNIVERSAL FLASH STORAGE HOST CONTROLLER DRIVER
  R:    Alim Akhtar <alim.akhtar@samsung.com>
  R:    Avri Altman <avri.altman@wdc.com>
 +R:    Bart Van Assche <bvanassche@acm.org>
  L:    linux-scsi@vger.kernel.org
  S:    Supported
  F:    Documentation/devicetree/bindings/ufs/
  F:    Documentation/scsi/ufs.rst
 -F:    drivers/scsi/ufs/
 +F:    drivers/ufs/core/
  
  UNIVERSAL FLASH STORAGE HOST CONTROLLER DRIVER DWC HOOKS
  M:    Pedro Sousa <pedrom.sousa@synopsys.com>
  L:    linux-scsi@vger.kernel.org
  S:    Supported
 -F:    drivers/scsi/ufs/*dwc*
 +F:    drivers/ufs/host/*dwc*
  
  UNIVERSAL FLASH STORAGE HOST CONTROLLER DRIVER MEDIATEK HOOKS
  M:    Stanley Chu <stanley.chu@mediatek.com>
  L:    linux-scsi@vger.kernel.org
  L:    linux-mediatek@lists.infradead.org (moderated for non-subscribers)
  S:    Maintained
 -F:    drivers/scsi/ufs/ufs-mediatek*
 +F:    drivers/ufs/host/ufs-mediatek*
  
  UNSORTED BLOCK IMAGES (UBI)
  M:    Richard Weinberger <richard@nod.at>
@@@ -20835,7 -20536,6 +20836,7 @@@ T:   git git://git.kernel.org/pub/scm/lin
  F:    Documentation/devicetree/bindings/usb/
  F:    Documentation/usb/
  F:    drivers/usb/
 +F:    include/dt-bindings/usb/
  F:    include/linux/usb.h
  F:    include/linux/usb/
  
@@@ -20884,6 -20584,7 +20885,6 @@@ F:   drivers/usb/host/uhci
  
  USB VIDEO CLASS
  M:    Laurent Pinchart <laurent.pinchart@ideasonboard.com>
 -L:    linux-uvc-devel@lists.sourceforge.net (subscribers-only)
  L:    linux-media@vger.kernel.org
  S:    Maintained
  W:    http://www.ideasonboard.org/uvc/
@@@ -21222,7 -20923,6 +21223,7 @@@ F:   include/uapi/linux/virtio_crypto.
  VIRTIO DRIVERS FOR S390
  M:    Cornelia Huck <cohuck@redhat.com>
  M:    Halil Pasic <pasic@linux.ibm.com>
 +M:    Eric Farman <farman@linux.ibm.com>
  L:    linux-s390@vger.kernel.org
  L:    virtualization@lists.linux-foundation.org
  L:    kvm@vger.kernel.org
@@@ -21373,7 -21073,7 +21374,7 @@@ L:   linux-kernel@vger.kernel.or
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git
  F:    Documentation/driver-api/vme.rst
 -F:    drivers/staging/vme/
 +F:    drivers/staging/vme_user/
  F:    drivers/vme/
  F:    include/linux/vme*
  
@@@ -21862,7 -21562,6 +21863,7 @@@ K:   (?:\b|_)xdp(?:\b|_
  XDP SOCKETS (AF_XDP)
  M:    Björn Töpel <bjorn@kernel.org>
  M:    Magnus Karlsson <magnus.karlsson@intel.com>
 +M:    Maciej Fijalkowski <maciej.fijalkowski@intel.com>
  R:    Jonathan Lemon <jonathan.lemon@gmail.com>
  L:    netdev@vger.kernel.org
  L:    bpf@vger.kernel.org
@@@ -21899,29 -21598,23 +21900,29 @@@ F:        arch/arm64/include/asm/xen
  F:    arch/arm64/xen/
  
  XEN HYPERVISOR INTERFACE
 -M:    Boris Ostrovsky <boris.ostrovsky@oracle.com>
  M:    Juergen Gross <jgross@suse.com>
 -R:    Stefano Stabellini <sstabellini@kernel.org>
 +M:    Stefano Stabellini <sstabellini@kernel.org>
 +R:    Oleksandr Tyshchenko <oleksandr_tyshchenko@epam.com>
  L:    xen-devel@lists.xenproject.org (moderated for non-subscribers)
  S:    Supported
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip.git
  F:    Documentation/ABI/stable/sysfs-hypervisor-xen
  F:    Documentation/ABI/testing/sysfs-hypervisor-xen
 -F:    arch/x86/include/asm/pvclock-abi.h
 -F:    arch/x86/include/asm/xen/
 -F:    arch/x86/platform/pvh/
 -F:    arch/x86/xen/
  F:    drivers/*/xen-*front.c
  F:    drivers/xen/
  F:    include/uapi/xen/
  F:    include/xen/
  
 +XEN HYPERVISOR X86
 +M:    Juergen Gross <jgross@suse.com>
 +R:    Boris Ostrovsky <boris.ostrovsky@oracle.com>
 +L:    xen-devel@lists.xenproject.org (moderated for non-subscribers)
 +S:    Supported
 +F:    arch/x86/include/asm/pvclock-abi.h
 +F:    arch/x86/include/asm/xen/
 +F:    arch/x86/platform/pvh/
 +F:    arch/x86/xen/
 +
  XEN NETWORK BACKEND DRIVER
  M:    Wei Liu <wei.liu@kernel.org>
  M:    Paul Durrant <paul@xen.org>
@@@ -21965,7 -21658,7 +21966,7 @@@ XEN SWIOTLB SUBSYSTE
  M:    Juergen Gross <jgross@suse.com>
  M:    Stefano Stabellini <sstabellini@kernel.org>
  L:    xen-devel@lists.xenproject.org (moderated for non-subscribers)
 -L:    iommu@lists.linux-foundation.org
 +L:    iommu@lists.linux.dev
  S:    Supported
  F:    arch/x86/xen/*swiotlb*
  F:    drivers/xen/*swiotlb*
@@@ -22002,7 -21695,7 +22003,7 @@@ M:   Appana Durga Kedareswara rao <appana
  R:    Naga Sureshkumar Relli <naga.sureshkumar.relli@xilinx.com>
  L:    linux-can@vger.kernel.org
  S:    Maintained
 -F:    Documentation/devicetree/bindings/net/can/xilinx_can.txt
 +F:    Documentation/devicetree/bindings/net/can/xilinx,can.yaml
  F:    drivers/net/can/xilinx_can.c
  
  XILINX GPIO DRIVER
@@@ -22026,12 -21719,6 +22027,12 @@@ F: drivers/misc/Makefil
  F:    drivers/misc/xilinx_sdfec.c
  F:    include/uapi/misc/xilinx_sdfec.h
  
 +XILINX PWM DRIVER
 +M:    Sean Anderson <sean.anderson@seco.com>
 +S:    Maintained
 +F:    drivers/pwm/pwm-xilinx.c
 +F:    include/clocksource/timer-xilinx.h
 +
  XILINX UARTLITE SERIAL DRIVER
  M:    Peter Korsgaard <jacmet@sunsite.dk>
  L:    linux-serial@vger.kernel.org
@@@ -22143,13 -21830,6 +22144,13 @@@ L: linux-mm@kvack.or
  S:    Maintained
  F:    mm/zbud.c
  
 +Z3FOLD COMPRESSED PAGE ALLOCATOR
 +M:    Vitaly Wool <vitaly.wool@konsulko.com>
 +R:    Miaohe Lin <linmiaohe@huawei.com>
 +L:    linux-mm@kvack.org
 +S:    Maintained
 +F:    mm/z3fold.c
 +
  ZD1211RW WIRELESS DRIVER
  M:    Ulrich Kunitz <kune@deine-taler.de>
  L:    linux-wireless@vger.kernel.org

diff --combined drivers/thermal/thermal_core.c
index 4c11a79659792199fc48d14279b429de27bdba92,f50098d3315278d4de14069954eedf7e65087208..6a5d0ae5d7a4c0c12ed980dd434e676878284025
--- 1/drivers/thermal/thermal_core.c
--- 2/drivers/thermal/thermal_core.c
+++ b/drivers/thermal/thermal_core.c
@@@ -340,12 -340,8 +340,8 @@@ void thermal_zone_device_critical(struc
  EXPORT_SYMBOL(thermal_zone_device_critical);
  
  static void handle_critical_trips(struct thermal_zone_device *tz,
-                                 int trip, enum thermal_trip_type trip_type)
+                                 int trip, int trip_temp, enum thermal_trip_type trip_type)
  {
-       int trip_temp;
- 
-       tz->ops->get_trip_temp(tz, trip, &trip_temp);
- 
        /* If we have not crossed the trip_temp, we do not care. */
        if (trip_temp <= 0 || tz->temperature < trip_temp)
                return;
@@@ -384,7 -380,7 +380,7 @@@ static void handle_thermal_trip(struct 
        }
  
        if (type == THERMAL_TRIP_CRITICAL || type == THERMAL_TRIP_HOT)
-               handle_critical_trips(tz, trip, type);
+               handle_critical_trips(tz, trip, trip_temp, type);
        else
                handle_non_critical_trips(tz, trip);
        /*
@@@ -505,7 -501,7 +501,7 @@@ void thermal_zone_device_update(struct 
  
        tz->notify_event = event;
  
-       for (count = 0; count < tz->trips; count++)
+       for (count = 0; count < tz->num_trips; count++)
                handle_thermal_trip(tz, count);
  }
  EXPORT_SYMBOL_GPL(thermal_zone_device_update);
@@@ -630,7 -626,7 +626,7 @@@ int thermal_zone_bind_cooling_device(st
        unsigned long max_state;
        int result, ret;
  
-       if (trip >= tz->trips || trip < 0)
+       if (trip >= tz->num_trips || trip < 0)
                return -EINVAL;
  
        list_for_each_entry(pos1, &thermal_tz_list, node) {
@@@ -667,7 -663,7 +663,7 @@@
        dev->target = THERMAL_NO_TARGET;
        dev->weight = weight;
  
 -      result = ida_simple_get(&tz->ida, 0, 0, GFP_KERNEL);
 +      result = ida_alloc(&tz->ida, GFP_KERNEL);
        if (result < 0)
                goto free_mem;
  
@@@ -721,7 -717,7 +717,7 @@@ remove_trip_file
  remove_symbol_link:
        sysfs_remove_link(&tz->device.kobj, dev->name);
  release_ida:
 -      ida_simple_remove(&tz->ida, dev->id);
 +      ida_free(&tz->ida, dev->id);
  free_mem:
        kfree(dev);
        return result;
@@@ -768,7 -764,7 +764,7 @@@ unbind
        device_remove_file(&tz->device, &pos->weight_attr);
        device_remove_file(&tz->device, &pos->attr);
        sysfs_remove_link(&tz->device.kobj, pos->name);
 -      ida_simple_remove(&tz->ida, pos->id);
 +      ida_free(&tz->ida, pos->id);
        kfree(pos);
        return 0;
  }
@@@ -811,7 -807,7 +807,7 @@@ static void __bind(struct thermal_zone_
  {
        int i, ret;
  
-       for (i = 0; i < tz->trips; i++) {
+       for (i = 0; i < tz->num_trips; i++) {
                if (mask & (1 << i)) {
                        unsigned long upper, lower;
  
@@@ -901,7 -897,7 +897,7 @@@ __thermal_cooling_device_register(struc
        if (!cdev)
                return ERR_PTR(-ENOMEM);
  
 -      ret = ida_simple_get(&thermal_cdev_ida, 0, 0, GFP_KERNEL);
 +      ret = ida_alloc(&thermal_cdev_ida, GFP_KERNEL);
        if (ret < 0)
                goto out_kfree_cdev;
        cdev->id = ret;
@@@ -952,7 -948,7 +948,7 @@@ out_kfree_type
        put_device(&cdev->device);
        cdev = NULL;
  out_ida_remove:
 -      ida_simple_remove(&thermal_cdev_ida, id);
 +      ida_free(&thermal_cdev_ida, id);
  out_kfree_cdev:
        kfree(cdev);
        return ERR_PTR(ret);
@@@ -1057,7 -1053,7 +1053,7 @@@ static void __unbind(struct thermal_zon
  {
        int i;
  
-       for (i = 0; i < tz->trips; i++)
+       for (i = 0; i < tz->num_trips; i++)
                if (mask & (1 << i))
                        thermal_zone_unbind_cooling_device(tz, i, cdev);
  }
@@@ -1111,7 -1107,7 +1107,7 @@@ void thermal_cooling_device_unregister(
  
        mutex_unlock(&thermal_list_lock);
  
 -      ida_simple_remove(&thermal_cdev_ida, cdev->id);
 +      ida_free(&thermal_cdev_ida, cdev->id);
        device_del(&cdev->device);
        thermal_cooling_device_destroy_sysfs(cdev);
        kfree(cdev->type);
@@@ -1159,10 -1155,18 +1155,18 @@@ exit
        mutex_unlock(&thermal_list_lock);
  }
  
+ static void thermal_set_delay_jiffies(unsigned long *delay_jiffies, int delay_ms)
+ {
+       *delay_jiffies = msecs_to_jiffies(delay_ms);
+       if (delay_ms > 1000)
+               *delay_jiffies = round_jiffies(*delay_jiffies);
+ }
+ 
  /**
-  * thermal_zone_device_register() - register a new thermal zone device
+  * thermal_zone_device_register_with_trips() - register a new thermal zone device
   * @type:     the thermal zone device type
-  * @trips:    the number of trip points the thermal zone support
+  * @trips:    a pointer to an array of thermal trips
+  * @num_trips:        the number of trip points the thermal zone support
   * @mask:     a bit string indicating the writeablility of trip points
   * @devdata:  private device data
   * @ops:      standard thermal zone device callbacks
@@@ -1184,10 -1188,10 +1188,10 @@@
   * IS_ERR*() helpers.
   */
  struct thermal_zone_device *
- thermal_zone_device_register(const char *type, int trips, int mask,
-                            void *devdata, struct thermal_zone_device_ops *ops,
-                            struct thermal_zone_params *tzp, int passive_delay,
-                            int polling_delay)
+ thermal_zone_device_register_with_trips(const char *type, struct thermal_trip *trips, int num_trips, int mask,
+                                       void *devdata, struct thermal_zone_device_ops *ops,
+                                       struct thermal_zone_params *tzp, int passive_delay,
+                                       int polling_delay)
  {
        struct thermal_zone_device *tz;
        enum thermal_trip_type trip_type;
@@@ -1198,27 -1202,27 +1202,27 @@@
        struct thermal_governor *governor;
  
        if (!type || strlen(type) == 0) {
-               pr_err("Error: No thermal zone type defined\n");
+               pr_err("No thermal zone type defined\n");
                return ERR_PTR(-EINVAL);
        }
  
        if (type && strlen(type) >= THERMAL_NAME_LENGTH) {
-               pr_err("Error: Thermal zone name (%s) too long, should be under %d chars\n",
+               pr_err("Thermal zone name (%s) too long, should be under %d chars\n",
                       type, THERMAL_NAME_LENGTH);
                return ERR_PTR(-EINVAL);
        }
  
-       if (trips > THERMAL_MAX_TRIPS || trips < 0 || mask >> trips) {
-               pr_err("Error: Incorrect number of thermal trips\n");
+       if (num_trips > THERMAL_MAX_TRIPS || num_trips < 0 || mask >> num_trips) {
+               pr_err("Incorrect number of thermal trips\n");
                return ERR_PTR(-EINVAL);
        }
  
        if (!ops) {
-               pr_err("Error: Thermal zone device ops not defined\n");
+               pr_err("Thermal zone device ops not defined\n");
                return ERR_PTR(-EINVAL);
        }
  
-       if (trips > 0 && (!ops->get_trip_type || !ops->get_trip_temp))
+       if (num_trips > 0 && (!ops->get_trip_type || !ops->get_trip_temp))
                return ERR_PTR(-EINVAL);
  
        tz = kzalloc(sizeof(*tz), GFP_KERNEL);
@@@ -1228,7 -1232,7 +1232,7 @@@
        INIT_LIST_HEAD(&tz->thermal_instances);
        ida_init(&tz->ida);
        mutex_init(&tz->lock);
 -      id = ida_simple_get(&thermal_tz_ida, 0, 0, GFP_KERNEL);
 +      id = ida_alloc(&thermal_tz_ida, GFP_KERNEL);
        if (id < 0) {
                result = id;
                goto free_tz;
@@@ -1249,6 -1253,7 +1253,7 @@@
        tz->device.class = &thermal_class;
        tz->devdata = devdata;
        tz->trips = trips;
+       tz->num_trips = num_trips;
  
        thermal_set_delay_jiffies(&tz->passive_delay_jiffies, passive_delay);
        thermal_set_delay_jiffies(&tz->polling_delay_jiffies, polling_delay);
@@@ -1266,7 -1271,7 +1271,7 @@@
        if (result)
                goto release_device;
  
-       for (count = 0; count < trips; count++) {
+       for (count = 0; count < num_trips; count++) {
                if (tz->ops->get_trip_type(tz, count, &trip_type) ||
                    tz->ops->get_trip_temp(tz, count, &trip_temp) ||
                    !trip_temp)
@@@ -1319,11 -1324,21 +1324,21 @@@ release_device
        put_device(&tz->device);
        tz = NULL;
  remove_id:
 -      ida_simple_remove(&thermal_tz_ida, id);
 +      ida_free(&thermal_tz_ida, id);
  free_tz:
        kfree(tz);
        return ERR_PTR(result);
  }
+ 
+ struct thermal_zone_device *thermal_zone_device_register(const char *type, int ntrips, int mask,
+                                                        void *devdata, struct thermal_zone_device_ops *ops,
+                                                        struct thermal_zone_params *tzp, int passive_delay,
+                                                        int polling_delay)
+ {
+       return thermal_zone_device_register_with_trips(type, NULL, ntrips, mask,
+                                                      devdata, ops, tzp,
+                                                      passive_delay, polling_delay);
+ }
  EXPORT_SYMBOL_GPL(thermal_zone_device_register);
  
  /**
@@@ -1379,7 -1394,7 +1394,7 @@@ void thermal_zone_device_unregister(str
        thermal_set_governor(tz, NULL);
  
        thermal_remove_hwmon_sysfs(tz);
 -      ida_simple_remove(&thermal_tz_ida, tz->id);
 +      ida_free(&thermal_tz_ida, tz->id);
        ida_destroy(&tz->ida);
        mutex_destroy(&tz->lock);
        device_unregister(&tz->device);