From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 17 Mar 2017 21:01:40 +0000 (-0700)
Subject: Merge branch 'x86-acpi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: MMI-PSA29.97-13-9~5962
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=ae13373319606fed3f84e1f6d27b40c7f0df6231;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

Merge branch 'x86-acpi-for-linus' of git://git./linux/kernel/git/tip/tip

Pull x86 acpi fixes from Thomas Gleixner:
 "This update deals with the fallout of the recent work to make
  cpuid/node mappings persistent.

  It turned out that the boot time ACPI based mapping tripped over ACPI
  inconsistencies and caused regressions. It's partially reverted and
  the fragile part replaced by an implementation which makes the mapping
  persistent when a CPU goes online for the first time"

* 'x86-acpi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  acpi/processor: Check for duplicate processor ids at hotplug time
  acpi/processor: Implement DEVICE operator for processor enumeration
  x86/acpi: Restore the order of CPU IDs
  Revert"x86/acpi: Enable MADT APIs to return disabled apicids"
  Revert "x86/acpi: Set persistent cpuid <-> nodeid mapping when booting"
---

ae13373319606fed3f84e1f6d27b40c7f0df6231