Subject: linux-next: manual merge of the drivers-x86 tree with Linus' tree

From: Stephen Rothwell <[email-masked]>
Date: Mon, 26 Aug 2024 13:44:03 +1000

Hi all,

Today's linux-next merge of the drivers-x86 tree got a conflict in:

  drivers/platform/surface/surface_aggregator_registry.c

between commits:

  28d04b4a2cc2 ("platform/surface: aggregator_registry: Add support for Surface Laptop Studio 2")
  99ae7b9ba047 ("platform/surface: aggregator_registry: Add support for Surface Laptop 6")

from Linus' tree and commit:

  b27622f13172 ("platform/surface: Add OF support")

from the drivers-x86 tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc drivers/platform/surface/surface_aggregator_registry.c
index a23dff35f8ca,ac96e883cb57..000000000000
--- a/drivers/platform/surface/surface_aggregator_registry.c
+++ b/drivers/platform/surface/surface_aggregator_registry.c
@@@ -275,24 -274,20 +276,36 @@@ static const struct software_node *ssam
  	NULL,
  };
  
 +/* Devices for Surface Laptop 6. */
 +static const struct software_node *ssam_node_group_sl6[] = {
 +	&ssam_node_root,
 +	&ssam_node_bat_ac,
 +	&ssam_node_bat_main,
 +	&ssam_node_tmp_perf_profile_with_fan,
 +	&ssam_node_tmp_sensors,
 +	&ssam_node_fan_speed,
 +	&ssam_node_hid_main_keyboard,
 +	&ssam_node_hid_main_touchpad,
 +	&ssam_node_hid_main_iid5,
 +	&ssam_node_hid_sam_sensors,
 +	&ssam_node_hid_sam_ucm_ucsi,
 +	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,