Skip to contentSkip to conversation

FAILED: patch "[PATCH] platform/x86: Kconfig: Fix dell-laptop dependency chain." failed to apply to 4.17-stable tree

PATCH [email protected] 1 participant 1 message Jun 21, 2018

Subsystems (2)
Stable branch x86 platform drivers
lore
Share & tools
lore

[email protected]

author maintainer
#0 lore raw

The patch below does not apply to the 4.17-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.

thanks,

greg k-h

------------------ original commit in Linus's tree ------------------

Quoted 1 line

From 6ed66c3ce095ae65bbc976b5817c318653745736 Mon Sep 17 00:00:00 2001

From: Mario Limonciello <[email protected]>
Date: Fri, 20 Apr 2018 12:42:11 -0500
Subject: [PATCH] platform/x86: Kconfig: Fix dell-laptop dependency chain.

As reported by Randy Dunlap:

Quoted 11 lines
Quoted 11 lines

WARNING: unmet direct dependencies detected for DELL_SMBIOS
Depends on [m]: X86 [=y] && X86_PLATFORM_DEVICES [=y]

	&& (DCDBAS [=m] ||

DCDBAS [=m]=n) && (ACPI_WMI [=n] || ACPI_WMI [=n]=n)
Selected by [y]:
- DELL_LAPTOP [=y] && X86 [=y] && X86_PLATFORM_DEVICES [=y]
&& DMI [=y]
&& BACKLIGHT_CLASS_DEVICE [=y] && (ACPI_VIDEO [=n] ||

	ACPI_VIDEO [=n]=n)

&& (RFKILL [=n] || RFKILL [=n]=n) && SERIO_I8042 [=y]

Right now it's possible to set dell laptop to compile in but this causes dell-smbios to compile in which breaks if dcdbas is a module.

Dell laptop shouldn't select dell-smbios anymore, but depend on it.

Fixes 32d7b19bad96 (platform/x86: dell-smbios: Resolve dependency error on DCDBAS)
Reported-by Randy Dunlap <[email protected]>
Signed-off-by Mario Limonciello <[email protected]>
Cc [email protected]
Signed-off-by Darren Hart (VMware) <[email protected]>
drivers/platform/x86/Kconfig +1 -1
index 39d06dd1f63a..bc309c5327ff 100644
@@ -154,7 +154,7 @@ config DELL_LAPTOP
 	depends on ACPI_VIDEO || ACPI_VIDEO = n
 	depends on RFKILL || RFKILL = n
 	depends on SERIO_I8042
-	select DELL_SMBIOS
+	depends on DELL_SMBIOS
 	select POWER_SUPPLY
 	select LEDS_CLASS
 	select NEW_LEDS