Merge branch 'smp-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 2 Sep 2018 17:09:35 +0000 (10:09 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 2 Sep 2018 17:09:35 +0000 (10:09 -0700)
Pull CPU hotplug fix from Thomas Gleixner:
 "Remove the stale skip_onerr member from the hotplug states"

* 'smp-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  cpu/hotplug: Remove skip_onerr field from cpuhp_step structure


Trivial merge