From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Hans de Goede <hdegoede@redhat•com>, Mark Gross <markgross@kernel•org>
Cc: "Ilpo Järvinen" <ilpo.jarvinen@linux•intel.com>,
"Konrad Dybcio" <quic_kdybcio@quicinc•com>,
"Linux Kernel Mailing List" <linux-kernel@vger•kernel.org>,
"Linux Next Mailing List" <linux-next@vger•kernel.org>,
"Maximilian Luz" <luzmaximilian@gmail•com>
Subject: linux-next: manual merge of the drivers-x86 tree with Linus' tree
Date: Mon, 26 Aug 2024 13:44:03 +1000 [thread overview]
Message-ID: <20240826134403.5177f7c6@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 2324 bytes --]
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,
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2024-08-26 3:44 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-08-26 3:44 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2025-05-09 6:24 linux-next: manual merge of the drivers-x86 tree with Linus' tree Stephen Rothwell
2025-01-14 3:32 Stephen Rothwell
2025-01-14 3:42 ` Kurt Borja
2024-03-08 2:34 Stephen Rothwell
2024-03-08 2:19 Stephen Rothwell
2024-03-01 3:14 Stephen Rothwell
2024-02-08 1:57 Stephen Rothwell
2024-01-02 2:30 Stephen Rothwell
2018-10-29 3:29 Stephen Rothwell
2018-10-29 9:34 ` Andy Shevchenko
2016-01-15 1:56 Stephen Rothwell
2015-06-02 6:07 Stephen Rothwell
2015-06-03 3:27 ` Darren Hart
2015-06-03 4:04 ` Stephen Rothwell
2012-05-31 2:06 Stephen Rothwell
2011-04-08 5:26 Stephen Rothwell
2011-03-24 2:48 Stephen Rothwell
2011-03-24 2:52 ` Matthew Garrett
2010-08-25 1:22 Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240826134403.5177f7c6@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=hdegoede@redhat$(echo .)com \
--cc=ilpo.jarvinen@linux$(echo .)intel.com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=luzmaximilian@gmail$(echo .)com \
--cc=markgross@kernel$(echo .)org \
--cc=quic_kdybcio@quicinc$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox