From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 2 Apr 2018 20:37:05 +0000 (-0700)
Subject: Merge branch 'smp-hotplug-for-linus' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: v4.17-rc1~176
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=67dbfc142310698b979d12a689aa9e0b4a93dced;p=users%2Fwilly%2Fxarray.git

Merge branch 'smp-hotplug-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull SMP hotplug updates from Ingo Molnar:
 "Simplify the CPU hot-plug state machine"

* 'smp-hotplug-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  cpu/hotplug: Fix unused function warning
  cpu/hotplug: Merge cpuhp_bp_states and cpuhp_ap_states
---

67dbfc142310698b979d12a689aa9e0b4a93dced