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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-ID: <20250114143229.0c6b8a87@canb.auug.org.au>
Date: Tue, 14 Jan 2025 14:32:29 +1100
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Hans de Goede <hdegoede@...hat.com>, Mark Gross <markgross@...nel.org>
Cc: Ilpo Järvinen <ilpo.jarvinen@...ux.intel.com>, Kurt
 Borja <kuurtb@...il.com>, Linux Kernel Mailing List
 <linux-kernel@...r.kernel.org>, Linux Next Mailing List
 <linux-next@...r.kernel.org>
Subject: linux-next: manual merge of the drivers-x86 tree with Linus' tree

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,

Content of type "application/pgp-signature" skipped