Merge tag 'platform-drivers-x86-v4.16-7' of git://git.infradead.org/linux-platform...
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 14 Mar 2018 20:01:14 +0000 (13:01 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 14 Mar 2018 20:01:14 +0000 (13:01 -0700)
commit274a1ff0704bc8fef76dbe2d6fb197ddbc23f380
tree5e90d30302b54a75f8bad0da8879e418e775f9b1
parent3032f8c504d2b15d58e4c96060a96b47e215573c
parent49368c13217f3b4d2e2d168e88b16c74910ad0ae
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