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>] [day] [month] [year] [list]

Message-ID: <20250509162409.586abb02@canb.auug.org.au>
Date: Fri, 9 May 2025 16:24:09 +1000
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>, Linux
 Kernel Mailing List <linux-kernel@...r.kernel.org>, Linux Next Mailing List
 <linux-next@...r.kernel.org>, "Luke D. Jones" <luke@...nes.dev>, Pavel
 Nikulin <pavel@...-labs.com>
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/asus-wmi.c

between commit:

  77bdac73754e ("platform/x86: asus-wmi: Disable OOBE state after resume from hibernation")

from Linus' tree and commit:

  feea7bd6b02d ("platform/x86: asus-wmi: Refactor Ally suspend/resume")

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/asus-wmi.c
index 47cc766624d7,27f11643a00d..000000000000
--- a/drivers/platform/x86/asus-wmi.c
+++ b/drivers/platform/x86/asus-wmi.c
@@@ -4724,9 -4780,6 +4781,7 @@@ static int asus_wmi_add(struct platform
  	asus->egpu_enable_available = asus_wmi_dev_is_present(asus, ASUS_WMI_DEVID_EGPU);
  	asus->dgpu_disable_available = asus_wmi_dev_is_present(asus, ASUS_WMI_DEVID_DGPU);
  	asus->kbd_rgb_state_available = asus_wmi_dev_is_present(asus, ASUS_WMI_DEVID_TUF_RGB_STATE);
 +	asus->oobe_state_available = asus_wmi_dev_is_present(asus, ASUS_WMI_DEVID_OOBE);
- 	asus->ally_mcu_usb_switch = acpi_has_method(NULL, ASUS_USB0_PWR_EC0_CSEE)
- 						&& dmi_check_system(asus_ally_mcu_quirk);

  	if (asus_wmi_dev_is_present(asus, ASUS_WMI_DEVID_MINI_LED_MODE))
  		asus->mini_led_dev_id = ASUS_WMI_DEVID_MINI_LED_MODE;

Content of type "application/pgp-signature" skipped