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>,
"Kurt Borja" <kuurtb@gmail•com>,
"Linux Kernel Mailing List" <linux-kernel@vger•kernel.org>,
"Linux Next Mailing List" <linux-next@vger•kernel.org>
Subject: linux-next: manual merge of the drivers-x86 tree with Linus' tree
Date: Tue, 14 Jan 2025 14:32:29 +1100 [thread overview]
Message-ID: <20250114143229.0c6b8a87@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1573 bytes --]
Hi all,
Today's linux-next merge of the drivers-x86 tree got a conflict in:
drivers/platform/x86/dell/alienware-wmi.c
between commit:
c1043cdb019e ("alienware-wmi: Fix X Series and G Series quirks")
from Linus' tree and commit:
7c605f6460e8 ("platform/x86: alienware-wmi: Improve rgb-zones group creation")
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/x86/dell/alienware-wmi.c
index 341d01d3e3e4,b4b43f3e3fd9..000000000000
--- a/drivers/platform/x86/dell/alienware-wmi.c
+++ b/drivers/platform/x86/dell/alienware-wmi.c
@@@ -694,20 -690,7 +699,10 @@@ static int alienware_zone_init(struct p
static void alienware_zone_exit(struct platform_device *dev)
{
- u8 zone;
-
+ if (!quirks->num_zones)
+ return;
+
- sysfs_remove_group(&dev->dev.kobj, &zone_attribute_group);
led_classdev_unregister(&global_led);
- if (zone_dev_attrs) {
- for (zone = 0; zone < quirks->num_zones; zone++)
- kfree(zone_dev_attrs[zone].attr.name);
- }
- kfree(zone_dev_attrs);
- kfree(zone_data);
- kfree(zone_attrs);
}
static acpi_status alienware_wmax_command(void *in_args, size_t in_size,
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2025-01-14 3:32 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-01-14 3:32 Stephen Rothwell [this message]
2025-01-14 3:42 ` linux-next: manual merge of the drivers-x86 tree with Linus' tree Kurt Borja
-- strict thread matches above, loose matches on Subject: below --
2025-05-09 6:24 Stephen Rothwell
2024-08-26 3:44 Stephen Rothwell
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=20250114143229.0c6b8a87@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=hdegoede@redhat$(echo .)com \
--cc=ilpo.jarvinen@linux$(echo .)intel.com \
--cc=kuurtb@gmail$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=markgross@kernel$(echo .)org \
/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