From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 14 Mar 2018 20:01:14 +0000 (-0700)
Subject: Merge tag 'platform-drivers-x86-v4.16-7' of git://git.infradead.org/linux-platform... 
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=274a1ff0704bc8fef76dbe2d6fb197ddbc23f380;p=linux.git

Merge tag 'platform-drivers-x86-v4.16-7' of git://git.infradead.org/linux-platform-drivers-x86

Pull x86 platform drives fixes from Darren Hart:

 - DELL_SMBIOS conditionally depends on ACPI_WMI in the same way it
   depends on DCDBAS, update the Kconfig accordingly.

 - fix the dell driver init order to ensure that the driver dependencies
   are met, avoiding race conditions resulting in boot failure on
   certain systems when the drivers are built-in.

* tag 'platform-drivers-x86-v4.16-7' of git://git.infradead.org/linux-platform-drivers-x86:
  platform/x86: Fix dell driver init order
  platform/x86: dell-smbios: Resolve dependency error on ACPI_WMI
---

274a1ff0704bc8fef76dbe2d6fb197ddbc23f380