From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 9 Sep 2018 13:48:06 +0000 (-0700)
Subject: Merge branch 'smp-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=e0a0d05848401df48b10f3defce14a5670a0f9f6;p=openwrt%2Fstaging%2Fblogic.git

Merge branch 'smp-urgent-for-linus' of git://git./linux/kernel/git/tip/tip

Pull cpu hotplug fixes from Thomas Gleixner:
 "Two fixes for the hotplug state machine code:

   - Move the misplaces smb() in the hotplug thread function to the
     proper place, otherwise a half update control struct could be
     observed

   - Prevent state corruption on error rollback, which causes the state
     to advance by one and as a consequence skip it in the bringup
     sequence"

* 'smp-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  cpu/hotplug: Prevent state corruption on error rollback
  cpu/hotplug: Adjust misplaced smb() in cpuhp_thread_fun()
---

e0a0d05848401df48b10f3defce14a5670a0f9f6