Merge tag 'hwmon-for-v6.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git...

Pull hwmon updates from Guenter Roeck:
 "New drivers:

   - PMBus client driver for Intel CRPS185 power supply

   - PMBus client driver for Texas Instruments TPS25990

  Chip support added to existing drivers:

   - pmbus/max15301: Add support for MAX15303

   - pmbus/adm1275: Add adm1273 support

   - lm75: Add NXP P3T1755 support; with it, add I3C support to the
     driver

   - asus-ec-sensors: Add TUF GAMING X670E PLUS

  Other notable changes:

   - nct6683: Add customer IDs for several MSI and ASRock boards

   - tmp108: Add regulator support

   - Improve write protect support in PMBus core

   - pmbus/dps920ab: Add ability to instantiate through i2c

   - The hwmon core now accepts NULL as device name parameter to
     [devm_]hwmon_device_register_with_info ans uses the parent device
     name as fallback in that case

   - The PMBus core now provides the PMBUs revision in a debugfs file

   - asus-ec-sensors: Support for optional CPU fan on AMD 600
     motherboards

   - raspberrypi: Add PM suspend/resume support

   - dell-smm: Enable manual fan control support on Dell XPS 9370

   - pwm-fan: Default to maximum cooling level if provided

  And various other minor fixes and improvements"

* tag 'hwmon-for-v6.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging: (44 commits)
  hwmon: pmbus: dps920ab: Add ability to instantiate through i2c
  hwmon: (pwm-fan) Default to the Maximum cooling level if provided
  hwmon: (asus_atk0110) Use str_enabled_disabled() and str_enable_disable() helpers
  hwmon: Fix help text for aspeed-g6-pwm-tach
  hwmon: (dell-smm) Add Dell XPS 9370 to fan control whitelist
  hwmon: (acpi_power_meter) Fix update the power trip points on failure
  hwmon: (acpi_power_meter) Fix uninitialized variables
  hwmon: (core) Use device name as a fallback in devm_hwmon_device_register_with_info
  hwmon: (pmbus/max15301) Add support for MAX15303
  hwmon: (pmbus/adm1275) add adm1273 support
  dt-bindings: hwmon: adm1275: add adm1273
  hwmon: (nct6683) Add another customer ID for MSI
  hwmon: (pwm-fan): Make use of device properties everywhere
  hwmon: (lm75) add I3C support for P3T1755
  hwmon: (lm75) separate probe into common and I2C parts
  hwmon: (lm75) Remove superfluous 'client' member from private struct
  hwmon: (lm75) simplify regulator handling
  hwmon: (lm75) simplify lm75_write_config()
  hwmon: (lm75) Hide register size differences in regmap access functions
  hwmon: (pmbus/crps) Add Intel CRPS185 power supply
  ...

diff --combined Documentation/hwmon/index.rst
index d96fd542aab26ab86b2b20bca83f392496cdfa76,b1ea445479b0c217f8952f02ce6125b9a05ff9ed..874f8fd2632520d3be489154ddd0eb7ca24fc405
--- 1/Documentation/hwmon/index.rst
--- 2/Documentation/hwmon/index.rst
+++ b/Documentation/hwmon/index.rst
@@@ -58,6 -58,7 +58,7 @@@ Hardware Monitoring Kernel Driver
     corsair-cpro
     corsair-psu
     cros_ec_hwmon
+    crps
     da9052
     da9055
     dell-smm-hwmon
@@@ -201,7 -202,6 +202,7 @@@
     pxe1610
     pwm-fan
     q54sj108a2
 +   qnap-mcu-hwmon
     raspberrypi-hwmon
     sbrmi
     sbtsi_temp
@@@ -237,6 -237,7 +238,7 @@@
     tmp464
     tmp513
     tps23861
+    tps25990
     tps40422
     tps53679
     tps546d24

diff --combined MAINTAINERS
index 11b0cf44383eb993e0acaafa984f33b26cb6ddff,3792893695050b7a4e02a94041063443e10db495..0ba9919cdea124fccc480a75b21e9590199624f0
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -185,14 -185,6 +185,14 @@@ W:       http://www.adaptec.com
  F:    Documentation/scsi/aacraid.rst
  F:    drivers/scsi/aacraid/
  
 +AAEON UPBOARD FPGA MFD DRIVER
 +M:    Thomas Richard <[email protected]>
 +S:    Maintained
 +F:    drivers/leds/leds-upboard.c
 +F:    drivers/mfd/upboard-fpga.c
 +F:    drivers/pinctrl/pinctrl-upboard.c
 +F:    include/linux/mfd/upboard-fpga.h
 +
  AB8500 BATTERY AND CHARGER DRIVERS
  M:    Linus Walleij <[email protected]>
  F:    Documentation/devicetree/bindings/power/supply/*ab8500*
@@@ -957,9 -949,10 +957,9 @@@ AMAZON ETHERNET DRIVER
  M:    Shay Agroskin <[email protected]>
  M:    Arthur Kiyanovski <[email protected]>
  R:    David Arinzon <[email protected]>
 -R:    Noam Dagan <[email protected]>
  R:    Saeed Bishara <[email protected]>
  L:    [email protected]
 -S:    Supported
 +S:    Maintained
  F:    Documentation/networking/device_drivers/ethernet/amazon/ena.rst
  F:    drivers/net/ethernet/amazon/
  
@@@ -1128,19 -1121,11 +1128,19 @@@ L:   [email protected]
  S:    Supported
  F:    drivers/i2c/busses/i2c-amd-asf-plat.c
  
 +AMD NODE DRIVER
 +M:    Mario Limonciello <[email protected]>
 +M:    Yazen Ghannam <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +F:    arch/x86/include/asm/amd_node.h
 +F:    arch/x86/kernel/amd_node.c
 +
  AMD PDS CORE DRIVER
  M:    Shannon Nelson <[email protected]>
  M:    Brett Creeley <[email protected]>
  L:    [email protected]
 -S:    Supported
 +S:    Maintained
  F:    Documentation/networking/device_drivers/ethernet/amd/pds_core.rst
  F:    drivers/net/ethernet/amd/pds_core/
  F:    include/linux/pds/
@@@ -1209,21 -1194,10 +1209,21 @@@ L:   [email protected]
  S:    Supported
  F:    drivers/spi/spi-amd.c
  
 +AMD XDNA DRIVER
 +M:    Min Ma <[email protected]>
 +M:    Lizhi Hou <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +T:    git https://gitlab.freedesktop.org/drm/misc/kernel.git
 +F:    Documentation/accel/amdxdna/
 +F:    drivers/accel/amdxdna/
 +F:    include/trace/events/amdxdna.h
 +F:    include/uapi/drm/amdxdna_accel.h
 +
  AMD XGBE DRIVER
  M:    "Shyam Sundar S K" <[email protected]>
  L:    [email protected]
 -S:    Supported
 +S:    Maintained
  F:    arch/arm64/boot/dts/amd/amd-seattle-xgbe*.dtsi
  F:    drivers/net/ethernet/amd/xgbe/
  
@@@ -1252,7 -1226,7 +1252,7 @@@ S:      Maintaine
  F:    Documentation/devicetree/bindings/rtc/amlogic,a4-rtc.yaml
  F:    drivers/rtc/rtc-amlogic-a4.c
  
- AMPHENOL CHIPCAP 2 HUMIDITY-TEMPERATURE IIO DRIVER
+ AMPHENOL CHIPCAP 2 DRIVER
  M:    Javier Carrasco <[email protected]>
  L:    [email protected]
  S:    Maintained
@@@ -1729,14 -1703,14 +1729,14 @@@ F:   drivers/edac/xgene_edac.
  APPLIED MICRO (APM) X-GENE SOC ETHERNET (V2) DRIVER
  M:    Iyappan Subramanian <[email protected]>
  M:    Keyur Chudgar <[email protected]>
 -S:    Supported
 +S:    Maintained
  F:    drivers/net/ethernet/apm/xgene-v2/
  
  APPLIED MICRO (APM) X-GENE SOC ETHERNET DRIVER
  M:    Iyappan Subramanian <[email protected]>
  M:    Keyur Chudgar <[email protected]>
  M:    Quan Nguyen <[email protected]>
 -S:    Supported
 +S:    Maintained
  F:    Documentation/devicetree/bindings/net/apm-xgene-enet.txt
  F:    Documentation/devicetree/bindings/net/apm-xgene-mdio.txt
  F:    drivers/net/ethernet/apm/xgene/
@@@ -1774,7 -1748,7 +1774,7 @@@ F:      drivers/hwmon/aquacomputer_d5next.
  AQUANTIA ETHERNET DRIVER (atlantic)
  M:    Igor Russkikh <[email protected]>
  L:    [email protected]
 -S:    Supported
 +S:    Maintained
  W:    https://www.marvell.com/
  Q:    https://patchwork.kernel.org/project/netdevbpf/list/
  F:    Documentation/networking/device_drivers/ethernet/aquantia/atlantic.rst
@@@ -1783,7 -1757,7 +1783,7 @@@ F:      drivers/net/ethernet/aquantia/atlant
  AQUANTIA ETHERNET DRIVER PTP SUBSYSTEM
  M:    Egor Pomozov <[email protected]>
  L:    [email protected]
 -S:    Supported
 +S:    Maintained
  W:    http://www.aquantia.com
  F:    drivers/net/ethernet/aquantia/atlantic/aq_ptp*
  
@@@ -1823,6 -1797,7 +1823,6 @@@ F:      include/uapi/linux/if_arcnet.
  
  ARM AND ARM64 SoC SUB-ARCHITECTURES (COMMON PARTS)
  M:    Arnd Bergmann <[email protected]>
 -M:    Olof Johansson <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  L:    [email protected]
  S:    Maintained
@@@ -1945,7 -1920,6 +1945,7 @@@ ARM PMU PROFILING AND DEBUGGIN
  M:    Will Deacon <[email protected]>
  M:    Mark Rutland <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
 +L:    [email protected]
  S:    Maintained
  F:    Documentation/devicetree/bindings/arm/pmu.yaml
  F:    Documentation/devicetree/bindings/perf/
@@@ -2319,7 -2293,7 +2319,7 @@@ F:      arch/arm/mach-highbank
  ARM/CAVIUM THUNDER NETWORK DRIVER
  M:    Sunil Goutham <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
 -S:    Supported
 +S:    Maintained
  F:    drivers/net/ethernet/cavium/thunder/
  
  ARM/CIRRUS LOGIC BK3 MACHINE SUPPORT
@@@ -2717,6 -2691,7 +2717,6 @@@ N:      at9
  N:    atmel
  
  ARM/Microchip Sparx5 SoC support
 -M:    Lars Povlsen <[email protected]>
  M:    Steen Hegelund <[email protected]>
  M:    Daniel Machon <[email protected]>
  M:    [email protected]
@@@ -2861,13 -2836,6 +2861,13 @@@ S:    Maintaine
  F:    arch/arm64/boot/dts/freescale/s32g*.dts*
  F:    drivers/pinctrl/nxp/
  
 +ARM/NXP S32G/S32R DWMAC ETHERNET DRIVER
 +M:    Jan Petrous <[email protected]>
 +L:    NXP S32 Linux Team <[email protected]>
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/net/nxp,s32-dwmac.yaml
 +F:    drivers/net/ethernet/stmicro/stmmac/dwmac-s32.c
 +
  ARM/Orion SoC/Technologic Systems TS-78xx platform support
  M:    Alexander Clouter <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
@@@ -3640,7 -3608,6 +3640,7 @@@ F:      drivers/phy/qualcomm/phy-ath79-usb.
  
  ATHEROS ATH GENERIC UTILITIES
  M:    Kalle Valo <[email protected]>
 +M:    Jeff Johnson <[email protected]>
  L:    [email protected]
  S:    Supported
  F:    drivers/net/wireless/ath/*
@@@ -3694,7 -3661,7 +3694,7 @@@ F:      include/uapi/linux/sonet.
  ATMEL MACB ETHERNET DRIVER
  M:    Nicolas Ferre <[email protected]>
  M:    Claudiu Beznea <[email protected]>
 -S:    Supported
 +S:    Maintained
  F:    drivers/net/ethernet/cadence/
  
  ATMEL MAXTOUCH DRIVER
@@@ -3902,9 -3869,9 +3902,9 @@@ S:      Maintaine
  F:    drivers/platform/x86/barco-p50-gpio.c
  
  BATMAN ADVANCED
 -M:    Marek Lindner <marek[email protected]>
 +M:    Marek Lindner <marek[email protected]>
  M:    Simon Wunderlich <[email protected]>
 -M:    Antonio Quartulli <a@unstable.cc>
 +M:    Antonio Quartulli <a[email protected]>
  M:    Sven Eckelmann <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
@@@ -3926,7 -3893,7 +3926,7 @@@ W:      http://www.baycom.org/~tom/ham/ham.h
  F:    drivers/net/hamradio/baycom*
  
  BCACHE (BLOCK LAYER CACHE)
 -M:    Coly Li <colyli@suse.de>
 +M:    Coly Li <colyli@kernel.org>
  M:    Kent Overstreet <[email protected]>
  L:    [email protected]
  S:    Maintained
@@@ -4091,6 -4058,7 +4091,6 @@@ F:      net/bluetooth
  
  BONDING DRIVER
  M:    Jay Vosburgh <[email protected]>
 -M:    Andy Gospodarek <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    Documentation/networking/bonding.rst
@@@ -4163,6 -4131,7 +4163,6 @@@ S:      Odd Fixe
  F:    drivers/net/ethernet/netronome/nfp/bpf/
  
  BPF JIT for POWERPC (32-BIT AND 64-BIT)
 -M:    Michael Ellerman <[email protected]>
  M:    Hari Bathini <[email protected]>
  M:    Christophe Leroy <[email protected]>
  R:    Naveen N Rao <[email protected]>
@@@ -4422,7 -4391,7 +4422,7 @@@ F:      drivers/net/ethernet/broadcom/asp2
  BROADCOM B44 10/100 ETHERNET DRIVER
  M:    Michael Chan <[email protected]>
  L:    [email protected]
 -S:    Supported
 +S:    Maintained
  F:    drivers/net/ethernet/broadcom/b44.*
  
  BROADCOM B53/SF2 ETHERNET SWITCH DRIVER
@@@ -4606,7 -4575,7 +4606,7 @@@ BROADCOM BNX2 GIGABIT ETHERNET DRIVE
  M:    Rasesh Mody <[email protected]>
  M:    [email protected]
  L:    [email protected]
 -S:    Supported
 +S:    Maintained
  F:    drivers/net/ethernet/broadcom/bnx2.*
  F:    drivers/net/ethernet/broadcom/bnx2_*
  
@@@ -4630,14 -4599,13 +4630,14 @@@ BROADCOM BNX2X 10 GIGABIT ETHERNET DRIV
  M:    Sudarsana Kalluru <[email protected]>
  M:    Manish Chopra <[email protected]>
  L:    [email protected]
 -S:    Supported
 +S:    Maintained
  F:    drivers/net/ethernet/broadcom/bnx2x/
  
  BROADCOM BNXT_EN 50 GIGABIT ETHERNET DRIVER
  M:    Michael Chan <[email protected]>
 +M:    Pavan Chebbi <[email protected]>
  L:    [email protected]
 -S:    Supported
 +S:    Maintained
  F:    drivers/firmware/broadcom/tee_bnxt_fw.c
  F:    drivers/net/ethernet/broadcom/bnxt/
  F:    include/linux/firmware/broadcom/tee_bnxt_fw.h
@@@ -4733,7 -4701,7 +4733,7 @@@ M:      Doug Berger <[email protected]
  M:    Florian Fainelli <[email protected]>
  R:    Broadcom internal kernel review list <[email protected]>
  L:    [email protected]
 -S:    Supported
 +S:    Maintained
  F:    Documentation/devicetree/bindings/net/brcm,bcmgenet.yaml
  F:    Documentation/devicetree/bindings/net/brcm,unimac-mdio.yaml
  F:    drivers/net/ethernet/broadcom/genet/
@@@ -4885,7 -4853,7 +4885,7 @@@ BROADCOM SYSTEMPORT ETHERNET DRIVE
  M:    Florian Fainelli <[email protected]>
  R:    Broadcom internal kernel review list <[email protected]>
  L:    [email protected]
 -S:    Supported
 +S:    Maintained
  F:    Documentation/devicetree/bindings/net/brcm,systemport.yaml
  F:    drivers/net/ethernet/broadcom/bcmsysport.*
  F:    drivers/net/ethernet/broadcom/unimac.h
@@@ -4894,7 -4862,7 +4894,7 @@@ BROADCOM TG3 GIGABIT ETHERNET DRIVE
  M:    Pavan Chebbi <[email protected]>
  M:    Michael Chan <[email protected]>
  L:    [email protected]
 -S:    Supported
 +S:    Maintained
  F:    drivers/net/ethernet/broadcom/tg3.*
  
  BROADCOM VK DRIVER
@@@ -4916,7 -4884,7 +4916,7 @@@ M:      Rasesh Mody <[email protected]
  M:    Sudarsana Kalluru <[email protected]>
  M:    [email protected]
  L:    [email protected]
 -S:    Supported
 +S:    Maintained
  F:    drivers/net/ethernet/brocade/bna/
  
  BSG (block layer generic sg v4 driver)
@@@ -5142,7 -5110,6 +5142,7 @@@ F:      include/uapi/linux/can/gw.
  F:    include/uapi/linux/can/isotp.h
  F:    include/uapi/linux/can/raw.h
  F:    net/can/
 +F:    net/sched/em_canid.c
  
  CAN-J1939 NETWORK LAYER
  M:    Robin van der Gracht <[email protected]>
@@@ -5502,7 -5469,6 +5502,7 @@@ L:      [email protected]
  L:    [email protected]
  S:    Maintained
  F:    Documentation/devicetree/bindings/sound/cirrus,cs*
 +F:    Documentation/sound/codecs/cs*
  F:    drivers/mfd/cs42l43*
  F:    drivers/pinctrl/cirrus/pinctrl-cs42l43*
  F:    drivers/spi/spi-cs42l43*
@@@ -5606,7 -5572,7 +5606,7 @@@ F:      drivers/scsi/snic
  CISCO VIC ETHERNET NIC DRIVER
  M:    Christian Benvenuti <[email protected]>
  M:    Satish Kharat <[email protected]>
 -S:    Supported
 +S:    Maintained
  F:    drivers/net/ethernet/cisco/enic/
  
  CISCO VIC LOW LATENCY NIC DRIVER
@@@ -6098,6 -6064,13 +6098,13 @@@ L:    [email protected]
  S:    Maintained
  F:    drivers/hid/hid-creative-sb0540.c
  
+ INTEL CRPS COMMON REDUNDANT PSU DRIVER
+ M:    Ninad Palsule <[email protected]>
+ L:    [email protected]
+ S:    Maintained
+ F:    Documentation/hwmon/crps.rst
+ F:    drivers/hwmon/pmbus/crps.c
+ 
  CRYPTO API
  M:    Herbert Xu <[email protected]>
  M:    "David S. Miller" <[email protected]>
@@@ -6204,7 -6177,7 +6211,7 @@@ F:      drivers/media/dvb-frontends/cxd2820r
  CXGB3 ETHERNET DRIVER (CXGB3)
  M:    Potnuri Bharat Teja <[email protected]>
  L:    [email protected]
 -S:    Supported
 +S:    Maintained
  W:    http://www.chelsio.com
  F:    drivers/net/ethernet/chelsio/cxgb3/
  
@@@ -6225,14 -6198,14 +6232,14 @@@ F:   drivers/crypto/chelsi
  CXGB4 ETHERNET DRIVER (CXGB4)
  M:    Potnuri Bharat Teja <[email protected]>
  L:    [email protected]
 -S:    Supported
 +S:    Maintained
  W:    http://www.chelsio.com
  F:    drivers/net/ethernet/chelsio/cxgb4/
  
  CXGB4 INLINE CRYPTO DRIVER
  M:    Ayush Sawal <[email protected]>
  L:    [email protected]
 -S:    Supported
 +S:    Maintained
  W:    http://www.chelsio.com
  F:    drivers/net/ethernet/chelsio/inline_crypto/
  
@@@ -6254,7 -6227,7 +6261,7 @@@ F:      include/uapi/rdma/cxgb4-abi.
  CXGB4VF ETHERNET DRIVER (CXGB4VF)
  M:    Potnuri Bharat Teja <[email protected]>
  L:    [email protected]
 -S:    Supported
 +S:    Maintained
  W:    http://www.chelsio.com
  F:    drivers/net/ethernet/chelsio/cxgb4vf/
  
@@@ -6262,8 -6235,8 +6269,8 @@@ CXL (IBM Coherent Accelerator Processo
  M:    Frederic Barrat <[email protected]>
  M:    Andrew Donnellan <[email protected]>
  L:    [email protected]
 -S:    Supported
 -F:    Documentation/ABI/testing/sysfs-class-cxl
 +S:    Obsolete
 +F:    Documentation/ABI/obsolete/sysfs-class-cxl
  F:    Documentation/arch/powerpc/cxl.rst
  F:    arch/powerpc/platforms/powernv/pci-cxl.c
  F:    drivers/misc/cxl/
@@@ -7104,8 -7077,7 +7111,8 @@@ T:      git https://gitlab.freedesktop.org/d
  F:    drivers/gpu/drm/sun4i/sun8i*
  
  DRM DRIVER FOR ARM PL111 CLCD
 -S:    Orphan
 +M:    Linus Walleij <[email protected]>
 +S:    Maintained
  T:    git https://gitlab.freedesktop.org/drm/misc/kernel.git
  F:    drivers/gpu/drm/pl111/
  
@@@ -7382,7 -7354,7 +7389,7 @@@ F:      drivers/gpu/drm/panel/panel-novatek-
  DRM DRIVER FOR NVIDIA GEFORCE/QUADRO GPUS
  M:    Karol Herbst <[email protected]>
  M:    Lyude Paul <[email protected]>
 -M:    Danilo Krummrich <dakr@redhat.com>
 +M:    Danilo Krummrich <dakr@kernel.org>
  L:    [email protected]
  L:    [email protected]
  S:    Supported
@@@ -7420,7 -7392,7 +7427,7 @@@ L:      [email protected]
  S:    Obsolete
  W:    https://www.kraxel.org/blog/2014/10/qemu-using-cirrus-considered-harmful/
  T:    git https://gitlab.freedesktop.org/drm/misc/kernel.git
 -F:    drivers/gpu/drm/tiny/cirrus.c
 +F:    drivers/gpu/drm/tiny/cirrus-qemu.c
  
  DRM DRIVER FOR QXL VIRTUAL GPU
  M:    Dave Airlie <[email protected]>
@@@ -7831,7 -7803,6 +7838,7 @@@ F:      drivers/gpu/drm/rockchip
  
  DRM DRIVERS FOR STI
  M:    Alain Volmat <[email protected]>
 +M:    Raphael Gallais-Pou <[email protected]>
  L:    [email protected]
  S:    Maintained
  T:    git https://gitlab.freedesktop.org/drm/misc/kernel.git
@@@ -8432,7 -8403,7 +8439,7 @@@ M:      Ajit Khaparde <ajit.khaparde@broadco
  M:    Sriharsha Basavapatna <[email protected]>
  M:    Somnath Kotur <[email protected]>
  L:    [email protected]
 -S:    Supported
 +S:    Maintained
  W:    http://www.emulex.com
  F:    drivers/net/ethernet/emulex/benet/
  
@@@ -8489,7 -8460,7 +8496,7 @@@ F:      include/video/s1d13xxxfb.
  EROFS FILE SYSTEM
  M:    Gao Xiang <[email protected]>
  M:    Chao Yu <[email protected]>
 -R:    Yue Hu <huyue2@coolpad.com>
 +R:    Yue Hu <zbestahu@gmail.com>
  R:    Jeffle Xu <[email protected]>
  R:    Sandeep Dhavale <[email protected]>
  L:    [email protected]
@@@ -8587,8 -8558,8 +8594,8 @@@ F:      rust/kernel/net/phy.r
  F:    rust/kernel/net/phy/reg.rs
  
  EXEC & BINFMT API, ELF
 +M:    Kees Cook <[email protected]>
  R:    Eric Biederman <[email protected]>
 -R:    Kees Cook <[email protected]>
  L:    [email protected]
  S:    Supported
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git for-next/execve
@@@ -8600,7 -8571,6 +8607,7 @@@ F:      fs/tests/binfmt_*_kunit.
  F:    fs/tests/exec_kunit.c
  F:    include/linux/binfmts.h
  F:    include/linux/elf.h
 +F:    include/uapi/linux/auxvec.h
  F:    include/uapi/linux/binfmts.h
  F:    include/uapi/linux/elf.h
  F:    tools/testing/selftests/exec/
@@@ -8961,7 -8931,7 +8968,7 @@@ F:      include/linux/arm_ffa.
  FIRMWARE LOADER (request_firmware)
  M:    Luis Chamberlain <[email protected]>
  M:    Russ Weight <[email protected]>
 -M:    Danilo Krummrich <dakr@redhat.com>
 +M:    Danilo Krummrich <dakr@kernel.org>
  L:    [email protected]
  S:    Maintained
  F:    Documentation/firmware_class/
@@@ -9472,7 -9442,7 +9479,7 @@@ F:      samples/ftrac
  FUNGIBLE ETHERNET DRIVERS
  M:    Dimitris Michailidis <[email protected]>
  L:    [email protected]
 -S:    Supported
 +S:    Maintained
  F:    drivers/net/ethernet/fungible/
  
  FUSE: FILESYSTEM IN USERSPACE
@@@ -9777,7 -9747,7 +9784,7 @@@ M:      Jeroen de Borst <[email protected]
  M:    Praveen Kaligineedi <[email protected]>
  R:    Shailend Chand <[email protected]>
  L:    [email protected]
 -S:    Supported
 +S:    Maintained
  F:    Documentation/networking/device_drivers/ethernet/google/gve.rst
  F:    drivers/net/ethernet/google
  
@@@ -10317,6 -10287,7 +10324,6 @@@ F:   drivers/input/touchscreen/himax_hx83
  
  HIPPI
  M:    Jes Sorensen <[email protected]>
 -L:    [email protected]
  S:    Maintained
  F:    drivers/net/hippi/
  F:    include/linux/hippidevice.h
@@@ -10998,7 -10969,7 +11005,7 @@@ M:   Rick Lindsley <[email protected]
  R:    Nick Child <[email protected]>
  R:    Thomas Falcon <[email protected]>
  L:    [email protected]
 -S:    Supported
 +S:    Maintained
  F:    drivers/net/ethernet/ibm/ibmvnic.*
  
  IBM Power VFIO Support
@@@ -11009,7 -10980,7 +11016,7 @@@ F:   drivers/vfio/vfio_iommu_spapr_tce.
  IBM Power Virtual Ethernet Device Driver
  M:    Nick Child <[email protected]>
  L:    [email protected]
 -S:    Supported
 +S:    Maintained
  F:    drivers/net/ethernet/ibm/ibmveth.*
  
  IBM Power Virtual FC Device Drivers
@@@ -11542,7 -11513,7 +11549,7 @@@ INTEL ETHERNET DRIVER
  M:    Tony Nguyen <[email protected]>
  M:    Przemek Kitszel <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
 -S:    Supported
 +S:    Maintained
  W:    https://www.intel.com/content/www/us/en/support.html
  Q:    https://patchwork.ozlabs.org/project/intel-wired-lan/list/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tnguy/net-queue.git
@@@ -12423,13 -12394,6 +12430,13 @@@ F: Documentation/kbuild/kconfig
  F:    scripts/Kconfig.include
  F:    scripts/kconfig/
  
 +KCORE
 +M:    Omar Sandoval <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    fs/proc/kcore.c
 +F:    include/linux/kcore.h
 +
  KCOV
  R:    Dmitry Vyukov <[email protected]>
  R:    Andrey Konovalov <[email protected]>
@@@ -12675,7 -12639,7 +12682,7 @@@ F:   arch/mips/include/uapi/asm/kvm
  F:    arch/mips/kvm/
  
  KERNEL VIRTUAL MACHINE FOR POWERPC (KVM/powerpc)
 -M:    Michael Ellerman <[email protected]>
 +M:    Madhavan Srinivasan <[email protected]>
  R:    Nicholas Piggin <[email protected]>
  L:    [email protected]
  L:    [email protected]
@@@ -12854,7 -12818,7 +12861,7 @@@ L:   [email protected]
  S:    Maintained
  W:    http://kgdb.wiki.kernel.org/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jwessel/kgdb.git
 -F:    Documentation/dev-tools/kgdb.rst
 +F:    Documentation/process/debugging/kgdb.rst
  F:    drivers/misc/kgdbts.c
  F:    drivers/tty/serial/kgdboc.c
  F:    include/linux/kdb.h
@@@ -13157,7 -13121,7 +13164,7 @@@ LIBETH COMMON ETHERNET LIBRAR
  M:    Alexander Lobakin <[email protected]>
  L:    [email protected]
  L:    [email protected] (moderated for non-subscribers)
 -S:    Supported
 +S:    Maintained
  T:    git https://github.com/alobakin/linux.git
  F:    drivers/net/ethernet/intel/libeth/
  F:    include/net/libeth/
@@@ -13167,7 -13131,7 +13174,7 @@@ LIBIE COMMON INTEL ETHERNET LIBRAR
  M:    Alexander Lobakin <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  L:    [email protected]
 -S:    Supported
 +S:    Maintained
  T:    git https://github.com/alobakin/linux.git
  F:    drivers/net/ethernet/intel/libie/
  F:    include/linux/net/intel/libie/
@@@ -13254,11 -13218,11 +13261,11 @@@ X:        drivers/macintosh/adb-iop.
  X:    drivers/macintosh/via-macii.c
  
  LINUX FOR POWERPC (32-BIT AND 64-BIT)
 +M:    Madhavan Srinivasan <[email protected]>
  M:    Michael Ellerman <[email protected]>
  R:    Nicholas Piggin <[email protected]>
  R:    Christophe Leroy <[email protected]>
  R:    Naveen N Rao <[email protected]>
 -M:    Madhavan Srinivasan <[email protected]>
  L:    [email protected]
  S:    Supported
  W:    https://github.com/linuxppc/wiki/wiki
@@@ -13344,7 -13308,7 +13351,7 @@@ L:   [email protected]
  L:    [email protected]
  L:    [email protected]
  S:    Supported
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git dev
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/rcu/linux.git rcu/dev
  F:    Documentation/atomic_bitops.txt
  F:    Documentation/atomic_t.txt
  F:    Documentation/core-api/refcount-vs-atomic.rst
@@@ -13468,8 -13432,8 +13475,8 @@@ LOCKING PRIMITIVE
  M:    Peter Zijlstra <[email protected]>
  M:    Ingo Molnar <[email protected]>
  M:    Will Deacon <[email protected]>
 +M:    Boqun Feng <[email protected]> (LOCKDEP & RUST)
  R:    Waiman Long <[email protected]>
 -R:    Boqun Feng <[email protected]> (LOCKDEP)
  L:    [email protected]
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git locking/core
@@@ -13483,11 -13447,6 +13490,11 @@@ F: include/linux/seqlock.
  F:    include/linux/spinlock*.h
  F:    kernel/locking/
  F:    lib/locking*.[ch]
 +F:    rust/helpers/mutex.c
 +F:    rust/helpers/spinlock.c
 +F:    rust/kernel/sync/lock.rs
 +F:    rust/kernel/sync/lock/
 +F:    rust/kernel/sync/locked_by.rs
  X:    kernel/locking/locktorture.c
  
  LOGICAL DISK MANAGER SUPPORT (LDM, Windows 2000/XP/Vista Dynamic Disks)
@@@ -13592,12 -13551,6 +13599,12 @@@ S: Maintaine
  F:    Documentation/devicetree/bindings/thermal/loongson,ls2k-thermal.yaml
  F:    drivers/thermal/loongson2_thermal.c
  
 +LOONGSON EDAC DRIVER
 +M:    Zhao Qunqin <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/edac/loongson_edac.c
 +
  LSILOGIC MPT FUSION DRIVERS (FC/SAS/SPI)
  M:    Sathya Prakash <[email protected]>
  M:    Sreekanth Reddy <[email protected]>
@@@ -13981,7 -13934,7 +13988,7 @@@ MARVELL OCTEON ENDPOINT DRIVE
  M:    Veerasenareddy Burru <[email protected]>
  M:    Sathesh Edara <[email protected]>
  L:    [email protected]
 -S:    Supported
 +S:    Maintained
  F:    drivers/net/ethernet/marvell/octeon_ep
  
  MARVELL OCTEON ENDPOINT VF DRIVER
@@@ -13990,7 -13943,7 +13997,7 @@@ M:   Sathesh Edara <[email protected]
  M:    Shinas Rasheed <[email protected]>
  M:    Satananda Burla <[email protected]>
  L:    [email protected]
 -S:    Supported
 +S:    Maintained
  F:    drivers/net/ethernet/marvell/octeon_ep_vf
  
  MARVELL OCTEONTX2 PHYSICAL FUNCTION DRIVER
@@@ -13998,9 -13951,8 +14005,9 @@@ M:   Sunil Goutham <[email protected]
  M:    Geetha sowjanya <[email protected]>
  M:    Subbaraya Sundeep <[email protected]>
  M:    hariprasad <[email protected]>
 +M:    Bharat Bhushan <[email protected]>
  L:    [email protected]
 -S:    Supported
 +S:    Maintained
  F:    drivers/net/ethernet/marvell/octeontx2/nic/
  F:    include/linux/soc/marvell/octeontx2/
  
@@@ -14012,7 -13964,7 +14019,7 @@@ M:   Jerin Jacob <[email protected]
  M:    hariprasad <[email protected]>
  M:    Subbaraya Sundeep <[email protected]>
  L:    [email protected]
 -S:    Supported
 +S:    Maintained
  F:    Documentation/networking/device_drivers/ethernet/marvell/octeontx2.rst
  F:    drivers/net/ethernet/marvell/octeontx2/af/
  
@@@ -14621,6 -14573,7 +14628,6 @@@ F:   drivers/dma/mediatek
  MEDIATEK ETHERNET DRIVER
  M:    Felix Fietkau <[email protected]>
  M:    Sean Wang <[email protected]>
 -M:    Mark Lee <[email protected]>
  M:    Lorenzo Bianconi <[email protected]>
  L:    [email protected]
  S:    Maintained
@@@ -14810,7 -14763,7 +14817,7 @@@ F:   drivers/memory/mtk-smi.
  F:    include/soc/mediatek/smi.h
  
  MEDIATEK SWITCH DRIVER
 -M:    Arınç ÜNAL <arinc[email protected]>
 +M:    Chester A. Unal <chester.a[email protected]>
  M:    Daniel Golle <[email protected]>
  M:    DENG Qingfang <[email protected]>
  M:    Sean Wang <[email protected]>
@@@ -14900,7 -14853,7 +14907,7 @@@ F:   drivers/i2c/busses/i2c-mlxbf.
  MELLANOX ETHERNET DRIVER (mlx4_en)
  M:    Tariq Toukan <[email protected]>
  L:    [email protected]
 -S:    Supported
 +S:    Maintained
  W:    https://www.nvidia.com/networking/
  Q:    https://patchwork.kernel.org/project/netdevbpf/list/
  F:    drivers/net/ethernet/mellanox/mlx4/en_*
@@@ -14909,7 -14862,7 +14916,7 @@@ MELLANOX ETHERNET DRIVER (mlx5e
  M:    Saeed Mahameed <[email protected]>
  M:    Tariq Toukan <[email protected]>
  L:    [email protected]
 -S:    Supported
 +S:    Maintained
  W:    https://www.nvidia.com/networking/
  Q:    https://patchwork.kernel.org/project/netdevbpf/list/
  F:    drivers/net/ethernet/mellanox/mlx5/core/en_*
@@@ -14917,7 -14870,7 +14924,7 @@@
  MELLANOX ETHERNET INNOVA DRIVERS
  R:    Boris Pismenny <[email protected]>
  L:    [email protected]
 -S:    Supported
 +S:    Maintained
  W:    https://www.nvidia.com/networking/
  Q:    https://patchwork.kernel.org/project/netdevbpf/list/
  F:    drivers/net/ethernet/mellanox/mlx5/core/en_accel/*
@@@ -14956,7 -14909,7 +14963,7 @@@ MELLANOX MLX4 core VPI drive
  M:    Tariq Toukan <[email protected]>
  L:    [email protected]
  L:    [email protected]
 -S:    Supported
 +S:    Maintained
  W:    https://www.nvidia.com/networking/
  Q:    https://patchwork.kernel.org/project/netdevbpf/list/
  F:    drivers/net/ethernet/mellanox/mlx4/
@@@ -14978,7 -14931,7 +14985,7 @@@ M:   Leon Romanovsky <[email protected]
  M:    Tariq Toukan <[email protected]>
  L:    [email protected]
  L:    [email protected]
 -S:    Supported
 +S:    Maintained
  W:    https://www.nvidia.com/networking/
  Q:    https://patchwork.kernel.org/project/netdevbpf/list/
  F:    Documentation/networking/device_drivers/ethernet/mellanox/
@@@ -15212,7 -15165,7 +15219,7 @@@ META ETHERNET DRIVER
  M:    Alexander Duyck <[email protected]>
  M:    Jakub Kicinski <[email protected]>
  R:    [email protected]
 -S:    Supported
 +S:    Maintained
  F:    Documentation/networking/device_drivers/ethernet/meta/
  F:    drivers/net/ethernet/meta/
  
@@@ -15399,7 -15352,7 +15406,7 @@@ M:   Daniel Machon <daniel.machon@microch
  M:    [email protected]
  L:    [email protected]
  S:    Maintained
 -F:    drivers/net/ethernet/microchip/lan969x/*
 +F:    drivers/net/ethernet/microchip/sparx5/lan969x/*
  
  MICROCHIP LCDFB DRIVER
  M:    Nicolas Ferre <[email protected]>
@@@ -16220,8 -16173,7 +16227,8 @@@ M:   Breno Leitao <[email protected]
  S:    Maintained
  F:    Documentation/networking/netconsole.rst
  F:    drivers/net/netconsole.c
 -F:    tools/testing/selftests/drivers/net/netcons_basic.sh
 +F:    tools/testing/selftests/drivers/net/lib/sh/lib_netcons.sh
 +F:    tools/testing/selftests/drivers/net/netcons\*
  
  NETDEVSIM
  M:    Jakub Kicinski <[email protected]>
@@@ -16238,7 -16190,7 +16245,7 @@@ F:   net/sched/sch_netem.
  NETERION 10GbE DRIVERS (s2io)
  M:    Jon Mason <[email protected]>
  L:    [email protected]
 -S:    Supported
 +S:    Maintained
  F:    Documentation/networking/device_drivers/ethernet/neterion/s2io.rst
  F:    drivers/net/ethernet/neterion/
  
@@@ -16337,7 -16289,7 +16344,7 @@@ F:   include/linux/inetdevice.
  F:    include/linux/netdev*
  F:    include/linux/platform_data/wiznet.h
  F:    include/uapi/linux/cn_proc.h
 -F:    include/uapi/linux/ethtool_netlink.h
 +F:    include/uapi/linux/ethtool_netlink*
  F:    include/uapi/linux/if_*
  F:    include/uapi/linux/net_shaper.h
  F:    include/uapi/linux/netdev*
@@@ -16392,7 -16344,6 +16399,7 @@@ F:   Documentation/networking
  F:    Documentation/networking/net_cachelines/
  F:    Documentation/process/maintainer-netdev.rst
  F:    Documentation/userspace-api/netlink/
 +F:    include/linux/ethtool.h
  F:    include/linux/framer/framer-provider.h
  F:    include/linux/framer/framer.h
  F:    include/linux/in.h
@@@ -16407,7 -16358,6 +16414,7 @@@ F:   include/linux/rtnetlink.
  F:    include/linux/seq_file_net.h
  F:    include/linux/skbuff*
  F:    include/net/
 +F:    include/uapi/linux/ethtool.h
  F:    include/uapi/linux/genetlink.h
  F:    include/uapi/linux/hsr_netlink.h
  F:    include/uapi/linux/in.h
@@@ -16563,7 -16513,7 +16570,7 @@@ M:   Manish Chopra <[email protected]
  M:    Rahul Verma <[email protected]>
  M:    [email protected]
  L:    [email protected]
 -S:    Supported
 +S:    Maintained
  F:    drivers/net/ethernet/qlogic/netxen/
  
  NET_FAILOVER MODULE
@@@ -17695,7 -17645,6 +17702,7 @@@ F:   Documentation/core-api/packing.rs
  F:    include/linux/packing.h
  F:    lib/packing.c
  F:    lib/packing_test.c
 +F:    scripts/gen_packed_field_checks.c
  
  PADATA PARALLEL EXECUTION MECHANISM
  M:    Steffen Klassert <[email protected]>
@@@ -18340,7 -18289,7 +18347,7 @@@ PENSANDO ETHERNET DRIVER
  M:    Shannon Nelson <[email protected]>
  M:    Brett Creeley <[email protected]>
  L:    [email protected]
 -S:    Supported
 +S:    Maintained
  F:    Documentation/networking/device_drivers/ethernet/pensando/ionic.rst
  F:    drivers/net/ethernet/pensando/
  
@@@ -18516,7 -18465,7 +18523,7 @@@ F:   Documentation/devicetree/bindings/pi
  F:    drivers/pinctrl/mediatek/
  
  PIN CONTROLLER - MEDIATEK MIPS
 -M:    Arınç ÜNAL <arinc[email protected]>
 +M:    Chester A. Unal <chester.a[email protected]>
  M:    Sergio Paracuellos <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  L:    [email protected]
@@@ -19107,7 -19056,7 +19114,7 @@@ F:   drivers/scsi/qedi
  QLOGIC QL4xxx ETHERNET DRIVER
  M:    Manish Chopra <[email protected]>
  L:    [email protected]
 -S:    Supported
 +S:    Maintained
  F:    drivers/net/ethernet/qlogic/qed/
  F:    drivers/net/ethernet/qlogic/qede/
  F:    include/linux/qed/
@@@ -19135,7 -19084,7 +19142,7 @@@ F:   drivers/scsi/qla2xxx
  QLOGIC QLA3XXX NETWORK DRIVER
  M:    [email protected]
  L:    [email protected]
 -S:    Supported
 +S:    Maintained
  F:    drivers/net/ethernet/qlogic/qla3xxx.*
  
  QLOGIC QLA4XXX iSCSI DRIVER
@@@ -19151,7 -19100,7 +19158,7 @@@ M:   Shahed Shaikh <[email protected]
  M:    Manish Chopra <[email protected]>
  M:    [email protected]
  L:    [email protected]
 -S:    Supported
 +S:    Maintained
  F:    drivers/net/ethernet/qlogic/qlcnic/
  
  QM1D1B0004 MEDIA DRIVER
@@@ -19166,15 -19115,6 +19173,15 @@@ L: [email protected]
  S:    Odd Fixes
  F:    drivers/media/tuners/qm1d1c0042*
  
 +QNAP MCU DRIVER
 +M:    Heiko Stuebner <[email protected]>
 +S:    Maintained
 +F:    drivers/hwmon/qnap-mcu-hwmon.c
 +F:    drivers/input/misc/qnap-mcu-input.c
 +F:    drivers/leds/leds-qnap-mcu.c
 +F:    drivers/mfd/qnap-mcu.c
 +F:    include/linux/mfd/qnap-mcu.h
 +
  QNX4 FILESYSTEM
  M:    Anders Larsen <[email protected]>
  S:    Maintained
@@@ -19569,7 -19509,7 +19576,7 @@@ S:   Maintaine
  F:    arch/mips/ralink
  
  RALINK MT7621 MIPS ARCHITECTURE
 -M:    Arınç ÜNAL <arinc[email protected]>
 +M:    Chester A. Unal <chester.a[email protected]>
  M:    Sergio Paracuellos <[email protected]>
  L:    [email protected]
  S:    Maintained
@@@ -19670,7 -19610,7 +19677,7 @@@ R:   Mathieu Desnoyers <mathieu.desnoyers
  R:    Lai Jiangshan <[email protected]>
  L:    [email protected]
  S:    Supported
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git dev
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/rcu/linux.git rcu/dev
  F:    tools/testing/selftests/rcutorture
  
  RDACM20 Camera Sensor
@@@ -19749,7 -19689,7 +19756,7 @@@ R:   Zqiang <[email protected]
  L:    [email protected]
  S:    Supported
  W:    http://www.rdrop.com/users/paulmck/RCU/
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git dev
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/rcu/linux.git rcu/dev
  F:    Documentation/RCU/
  F:    include/linux/rcu*
  F:    kernel/rcu/
@@@ -19901,7 -19841,7 +19908,7 @@@ M:   Paul Barker <[email protected]
  M:    Niklas Söderlund <[email protected]>
  L:    [email protected]
  L:    [email protected]
 -S:    Supported
 +S:    Maintained
  F:    Documentation/devicetree/bindings/net/renesas,etheravb.yaml
  F:    drivers/net/ethernet/renesas/Kconfig
  F:    drivers/net/ethernet/renesas/Makefile
@@@ -19921,7 -19861,7 +19928,7 @@@ RENESAS ETHERNET TSN DRIVE
  M:    Niklas Söderlund <[email protected]>
  L:    [email protected]
  L:    [email protected]
 -S:    Supported
 +S:    Maintained
  F:    Documentation/devicetree/bindings/net/renesas,ethertsn.yaml
  F:    drivers/net/ethernet/renesas/rtsn.*
  
@@@ -20071,7 -20011,7 +20078,7 @@@ RENESAS SUPERH ETHERNET DRIVE
  M:    Niklas Söderlund <[email protected]>
  L:    [email protected]
  L:    [email protected]
 -S:    Supported
 +S:    Maintained
  F:    Documentation/devicetree/bindings/net/renesas,ether.yaml
  F:    drivers/net/ethernet/renesas/Kconfig
  F:    drivers/net/ethernet/renesas/Makefile
@@@ -20914,7 -20854,7 +20921,7 @@@ F:   include/linux/platform_data/spi-s3c6
  SAMSUNG SXGBE DRIVERS
  M:    Byungho An <[email protected]>
  L:    [email protected]
 -S:    Supported
 +S:    Maintained
  F:    drivers/net/ethernet/samsung/sxgbe/
  
  SAMSUNG THERMAL DRIVER
@@@ -20972,8 -20912,6 +20979,8 @@@ F:   kernel/sched
  SCHEDULER - SCHED_EXT
  R:    Tejun Heo <[email protected]>
  R:    David Vernet <[email protected]>
 +R:    Andrea Righi <[email protected]>
 +R:    Changwoo Min <[email protected]>
  L:    [email protected]
  S:    Maintained
  W:    https://github.com/sched-ext/scx
@@@ -21316,7 -21254,7 +21323,7 @@@ M:   Edward Cree <[email protected]
  M:    Martin Habets <[email protected]>
  L:    [email protected]
  L:    [email protected]
 -S:    Supported
 +S:    Maintained
  F:    Documentation/networking/devlink/sfc.rst
  F:    drivers/net/ethernet/sfc/
  
@@@ -21647,7 -21585,7 +21654,7 @@@ R:   Mathieu Desnoyers <mathieu.desnoyers
  L:    [email protected]
  S:    Supported
  W:    http://www.rdrop.com/users/paulmck/RCU/
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git dev
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/rcu/linux.git rcu/dev
  F:    include/linux/srcu*.h
  F:    kernel/rcu/srcu*.c
  
@@@ -22058,7 -21996,6 +22065,7 @@@ W:   https://github.com/thesofproject/lin
  F:    sound/soc/sof/
  
  SOUND - GENERIC SOUND CARD (Simple-Audio-Card, Audio-Graph-Card)
 +M:    Mark Brown <[email protected]>
  M:    Kuninori Morimoto <[email protected]>
  S:    Supported
  L:    [email protected]
@@@ -22513,7 -22450,7 +22520,7 @@@ F:   arch/*/kernel/static_call.
  F:    include/linux/jump_label*.h
  F:    include/linux/static_call*.h
  F:    kernel/jump_label.c
 -F:    kernel/static_call.c
 +F:    kernel/static_call*.c
  
  STI AUDIO (ASoC) DRIVERS
  M:    Arnaud Pouliquen <[email protected]>
@@@ -22569,8 -22506,11 +22576,8 @@@ F:  Documentation/devicetree/bindings/ph
  F:    drivers/phy/st/phy-stm32-combophy.c
  
  STMMAC ETHERNET DRIVER
 -M:    Alexandre Torgue <[email protected]>
 -M:    Jose Abreu <[email protected]>
  L:    [email protected]
 -S:    Supported
 -W:    http://www.stlinux.com
 +S:    Orphan
  F:    Documentation/networking/device_drivers/ethernet/stmicro/
  F:    drivers/net/ethernet/stmicro/stmmac/
  
@@@ -22798,12 -22738,13 +22805,12 @@@ F:        include/linux/platform_data/dma-dw.
  SYNOPSYS DESIGNWARE ENTERPRISE ETHERNET DRIVER
  M:    Jose Abreu <[email protected]>
  L:    [email protected]
 -S:    Supported
 +S:    Maintained
  F:    drivers/net/ethernet/synopsys/
  
  SYNOPSYS DESIGNWARE ETHERNET XPCS DRIVER
 -M:    Jose Abreu <[email protected]>
  L:    [email protected]
 -S:    Supported
 +S:    Orphan
  F:    drivers/net/pcs/pcs-xpcs.c
  F:    drivers/net/pcs/pcs-xpcs.h
  F:    include/linux/pcs/pcs-xpcs.h
@@@ -23198,7 -23139,7 +23205,7 @@@ F:   drivers/phy/tegra/xusb
  TEHUTI ETHERNET DRIVER
  M:    Andy Gospodarek <[email protected]>
  L:    [email protected]
 -S:    Supported
 +S:    Maintained
  F:    drivers/net/ethernet/tehuti/tehuti.*
  
  TEHUTI TN40XX ETHERNET DRIVER
@@@ -23284,6 -23225,8 +23291,8 @@@ M:   Jerome Brunet <[email protected]
  L:    [email protected]
  S:    Maintained
  F:    Documentation/devicetree/bindings/hwmon/pmbus/ti,tps25990.yaml
+ F:    Documentation/hwmon/tps25990.rst
+ F:    drivers/hwmon/pmbus/tps25990.c
  
  TEXAS INSTRUMENTS TPS23861 PoE PSE DRIVER
  M:    Robert Marko <[email protected]>
@@@ -23301,13 -23244,6 +23310,13 @@@ S: Supporte
  F:    Documentation/devicetree/bindings/iio/dac/ti,dac7612.yaml
  F:    drivers/iio/dac/ti-dac7612.c
  
 +TEXAS INSTRUMENTS' LB8864 LED BACKLIGHT DRIVER
 +M:    Alexander Sverdlin <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/leds/backlight/ti,lp8864.yaml
 +F:    drivers/leds/leds-lp8864.c
 +
  TEXAS INSTRUMENTS' SYSTEM CONTROL INTERFACE (TISCI) PROTOCOL DRIVER
  M:    Nishanth Menon <[email protected]>
  M:    Tero Kristo <[email protected]>
@@@ -23718,6 -23654,7 +23727,6 @@@ F:   tools/testing/selftests/timers
  
  TIPC NETWORK LAYER
  M:    Jon Maloy <[email protected]>
 -M:    Ying Xue <[email protected]>
  L:    [email protected] (core kernel code)
  L:    [email protected] (user apps, general discussion)
  S:    Maintained
@@@ -23779,7 -23716,7 +23788,7 @@@ M:   "Paul E. McKenney" <[email protected]
  M:    Josh Triplett <[email protected]>
  L:    [email protected]
  S:    Supported
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git dev
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/rcu/linux.git rcu/dev
  F:    Documentation/RCU/torture.rst
  F:    kernel/locking/locktorture.c
  F:    kernel/rcu/rcuscale.c
@@@ -24323,8 -24260,7 +24332,8 @@@ F:   Documentation/devicetree/bindings/us
  F:    drivers/usb/isp1760/*
  
  USB LAN78XX ETHERNET DRIVER
 -M:    Woojung Huh <[email protected]>
 +M:    Thangaraj Samynathan <[email protected]>
 +M:    Rengarajan Sundararajan <[email protected]>
  M:    [email protected]
  L:    [email protected]
  S:    Maintained

diff --combined drivers/hwmon/Kconfig
index ea2f095da63e22587e9cf45fb14f55afc628b97e,760c1a1cf30cd1d8977b643bda590c01c19b5867..4cbaba15d86ef46a27838ce96c59ecfdce60acf7
--- 1/drivers/hwmon/Kconfig
--- 2/drivers/hwmon/Kconfig
+++ b/drivers/hwmon/Kconfig
@@@ -324,7 -324,7 +324,7 @@@ config SENSORS_K8TEM
  
  config SENSORS_K10TEMP
        tristate "AMD Family 10h+ temperature sensor"
 -      depends on X86 && PCI && AMD_NB
 +      depends on X86 && PCI && AMD_NODE
        help
          If you say yes here you get support for the temperature
          sensor(s) inside your CPU. Supported are later revisions of
@@@ -413,7 -413,7 +413,7 @@@ config SENSORS_ASPEE
          will be called aspeed_pwm_tacho.
  
  config SENSORS_ASPEED_G6
-       tristate "ASPEED g6 PWM and Fan tach driver"
+       tristate "ASPEED G6 PWM and Fan tach driver"
        depends on ARCH_ASPEED || COMPILE_TEST
        depends on PWM
        help
@@@ -421,7 -421,7 +421,7 @@@
          controllers.
  
          This driver can also be built as a module. If so, the module
-         will be called aspeed_pwm_tacho.
+         will be called aspeed_g6_pwm_tach.
  
  config SENSORS_ATXP1
        tristate "Attansic ATXP1 VID controller"
@@@ -1412,7 -1412,9 +1412,9 @@@ config SENSORS_LM7
  config SENSORS_LM75
        tristate "National Semiconductor LM75 and compatibles"
        depends on I2C
+       depends on I3C || !I3C
        select REGMAP_I2C
+       select REGMAP_I3C if I3C
        help
          If you say yes here you get support for one common type of
          temperature sensor chip, with models including:
@@@ -1822,18 -1824,6 +1824,18 @@@ config SENSORS_PWM_FA
          This driver can also be built as a module. If so, the module
          will be called pwm-fan.
  
 +config SENSORS_QNAP_MCU_HWMON
 +      tristate "QNAP MCU hardware monitoring"
 +      depends on MFD_QNAP_MCU
 +      depends on THERMAL || THERMAL=n
 +      help
 +        Say yes here to enable support for fan and temperature sensor
 +        connected to a QNAP MCU, as found in a number of QNAP network
 +        attached storage devices.
 +
 +        This driver can also be built as a module. If so, the module
 +        will be called qnap-mcu-hwmon.
 +
  config SENSORS_RASPBERRYPI_HWMON
        tristate "Raspberry Pi voltage monitor"
        depends on RASPBERRYPI_FIRMWARE || (COMPILE_TEST && !RASPBERRYPI_FIRMWARE)

diff --combined drivers/hwmon/acpi_power_meter.c
index 3db1b9d09c32ad94ecf4328808371d67b66291fa,65de2cadfc60e01288dc2d2a5dc80a0c4e5446f7..44afb07409a465b9762a537aa9960c667884a87c
--- 1/drivers/hwmon/acpi_power_meter.c
--- 2/drivers/hwmon/acpi_power_meter.c
+++ b/drivers/hwmon/acpi_power_meter.c
@@@ -84,6 -84,7 +84,7 @@@ struct acpi_power_meter_resource 
        u64             power;
        u64             cap;
        u64             avg_interval;
+       bool            power_alarm;
        int                     sensors_valid;
        unsigned long           sensors_last_updated;
        struct sensor_device_attribute  sensors[NUM_SENSORS];
@@@ -292,8 -293,8 +293,8 @@@ static ssize_t set_trip(struct device *
        struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
        struct acpi_device *acpi_dev = to_acpi_device(dev);
        struct acpi_power_meter_resource *resource = acpi_dev->driver_data;
+       unsigned long temp, trip_bk;
        int res;
-       unsigned long temp;
  
        res = kstrtoul(buf, 10, &temp);
        if (res)
@@@ -301,13 -302,15 +302,15 @@@
  
        temp = DIV_ROUND_CLOSEST(temp, 1000);
  
-       mutex_lock(&resource->lock);
+       guard(mutex)(&resource->lock);
+ 
+       trip_bk = resource->trip[attr->index - 7];
        resource->trip[attr->index - 7] = temp;
        res = set_acpi_trip(resource);
-       mutex_unlock(&resource->lock);
- 
-       if (res)
+       if (res) {
+               resource->trip[attr->index - 7] = trip_bk;
                return res;
+       }
  
        return count;
  }
@@@ -396,6 -399,9 +399,9 @@@ static ssize_t show_val(struct device *
        struct acpi_device *acpi_dev = to_acpi_device(dev);
        struct acpi_power_meter_resource *resource = acpi_dev->driver_data;
        u64 val = 0;
+       int ret;
+ 
+       guard(mutex)(&resource->lock);
  
        switch (attr->index) {
        case 0:
@@@ -423,10 -429,17 +429,17 @@@
                        val = 0;
                break;
        case 6:
-               if (resource->power > resource->cap)
-                       val = 1;
-               else
-                       val = 0;
+               ret = update_meter(resource);
+               if (ret)
+                       return ret;
+               /* need to update cap if not to support the notification. */
+               if (!(resource->caps.flags & POWER_METER_CAN_NOTIFY)) {
+                       ret = update_cap(resource);
+                       if (ret)
+                               return ret;
+               }
+               val = resource->power_alarm || resource->power > resource->cap;
+               resource->power_alarm = resource->power > resource->cap;
                break;
        case 7:
        case 8:
@@@ -682,7 -695,7 +695,7 @@@ static int setup_attrs(struct acpi_powe
  
        /* _PMD method is optional. */
        res = read_domain_devices(resource);
 -      if (res != -ENODEV)
 +      if (res && res != -ENODEV)
                return res;
  
        if (resource->caps.flags & POWER_METER_CAN_MEASURE) {
@@@ -847,12 -860,20 +860,20 @@@ static void acpi_power_meter_notify(str
                sysfs_notify(&device->dev.kobj, NULL, POWER_AVERAGE_NAME);
                break;
        case METER_NOTIFY_CAP:
+               mutex_lock(&resource->lock);
+               res = update_cap(resource);
+               if (res)
+                       dev_err_once(&device->dev, "update cap failed when capping value is changed.\n");
+               mutex_unlock(&resource->lock);
                sysfs_notify(&device->dev.kobj, NULL, POWER_CAP_NAME);
                break;
        case METER_NOTIFY_INTERVAL:
                sysfs_notify(&device->dev.kobj, NULL, POWER_AVG_INTERVAL_NAME);
                break;
        case METER_NOTIFY_CAPPING:
+               mutex_lock(&resource->lock);
+               resource->power_alarm = true;
+               mutex_unlock(&resource->lock);
                sysfs_notify(&device->dev.kobj, NULL, POWER_ALARM_NAME);
                dev_info(&device->dev, "Capping in progress.\n");
                break;