From: Hans de Goede <hdegoede@redhat.com>
Date: Thu, 5 Sep 2024 14:51:58 +0000 (+0200)
Subject: Merge tag 'hwmon-for-v6.11-rc7' into review-hans
X-Git-Tag: v6.12-rc1~131^2~17
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=56d8b784c56588cd40f98e4b1d4f6e29e3cb02b8;p=thirdparty%2Fkernel%2Flinux.git

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.
---

56d8b784c56588cd40f98e4b1d4f6e29e3cb02b8
diff --cc drivers/platform/surface/surface_aggregator_registry.c
index ac96e883cb57f,a23dff35f8ca2..25c8aa2131d63
--- a/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 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. */
- static const struct software_node *ssam_node_group_sls[] = {
+ /* 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,