Merge tag 'hwmon-for-v6.11-rc7' into review-hans

Merge "hwmon fixes for v6.11-rc7" into review-hans to bring in
commit a54da9df75cd ("hwmon: (hp-wmi-sensors) Check if WMI event
data exists").

This is a dependency for a set of WMI event data refactoring changes.

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/hid/hid-asus.c
Simple merge

diff --cc drivers/platform/surface/aggregator/controller.c
Simple merge

diff --cc drivers/platform/surface/surface_aggregator_registry.c
index ac96e883cb57f210827d2135d604bae733b8ea83,a23dff35f8ca23fc7788d133d1a4f9182cffdaf5..25c8aa2131d63872c231c069cb73fef5d3466268
--- 1/drivers/platform/surface/surface_aggregator_registry.c
--- 2/drivers/platform/surface/surface_aggregator_registry.c
+++ b/drivers/platform/surface/surface_aggregator_registry.c
@@@ -274,20 -291,8 +292,20 @@@ static const struct software_node *ssam
        NULL,
  };
  
- /* Devices for Surface Laptop Studio. */
- static const struct software_node *ssam_node_group_sls[] = {
 +/* Devices for Surface Laptop 7. */
 +static const struct software_node *ssam_node_group_sl7[] = {
 +      &ssam_node_root,
 +      &ssam_node_bat_ac,
 +      &ssam_node_bat_main,
 +      &ssam_node_tmp_perf_profile_with_fan,
 +      &ssam_node_fan_speed,
 +      &ssam_node_hid_sam_keyboard,
 +      /* TODO: evaluate thermal sensors devices when we get a driver for that */
 +      NULL,
 +};
 +
+ /* Devices for Surface Laptop Studio 1. */
+ static const struct software_node *ssam_node_group_sls1[] = {
        &ssam_node_root,
        &ssam_node_bat_ac,
        &ssam_node_bat_main,

diff --cc drivers/platform/x86/asus-nb-wmi.c
Simple merge

diff --cc drivers/platform/x86/asus-wmi.c
Simple merge

diff --cc drivers/platform/x86/dell/Kconfig
Simple merge

diff --cc drivers/platform/x86/x86-android-tablets/dmi.c
Simple merge