On Thu, Jul 12, 2018 at 08:30:10AM +0200, Greg KH wrote:
> On Wed, Jul 11, 2018 at 08:35:17PM +0100, Sudip Mukherjee wrote:
> > Hi Greg,
> >
> > I think you have missed 6ed66c3ce095ae65bbc976b5817c318653745736 for
> > the v4.14-stable tree. No backport needed, it will apply cleanly.
>
> No, I didn't miss it, it failed to apply to 4.17.y and I sent out
> rejection emails. Why would I apply it to 4.14.y if it is not in
> 4.17.y?
But it was added in v4.17-rc4.6 via:
7fe3fa3b5ec8 ("platform/x86: Kconfig: Fix dell-laptop dependency chain.")
in v4.16.8 via:
0897d3c34dae ("platform/x86: Kconfig: Fix dell-laptop dependency chain.")
missing only in v4.14.y.
The attached patch should be good for 4.14-stable.
But now I have a little confusion here, the commit says that it fixes
32d7b19bad96 which was added in v4.16. So, is it needed in 4.14.y?
Added Mario for his comments.
--
Regards
Sudip
>From f6c7352c09ea461316e7ef5ce40ee49b03c178d6 Mon Sep 17 00:00:00 2001
From: Mario Limonciello <mario.limonciello@xxxxxxxx>
Date: Fri, 20 Apr 2018 12:42:11 -0500
Subject: [PATCH] platform/x86: Kconfig: Fix dell-laptop dependency chain.
commit 7fe3fa3b5ec8e75389cce4bf5d052a52e6198d59 upstream
As reported by Randy Dunlap:
>> 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 <rdunlap@xxxxxxxxxxxxx>
Signed-off-by: Mario Limonciello <mario.limonciello@xxxxxxxx>
Cc: stable@xxxxxxxxxxxxxxx
Signed-off-by: Darren Hart (VMware) <dvhart@xxxxxxxxxxxxx>
Signed-off-by: Sudip Mukherjee <sudipm.mukherjee@xxxxxxxxx>
---
drivers/platform/x86/Kconfig | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig
index 80b87954f6dd..136a8f49ff92 100644
--- a/drivers/platform/x86/Kconfig
+++ b/drivers/platform/x86/Kconfig
@@ -107,7 +107,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
--
2.11.0
