Merge tag 'for-linus-4.14c-rc5-tag' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 13 Oct 2017 18:35:03 +0000 (11:35 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 13 Oct 2017 18:35:03 +0000 (11:35 -0700)
commit3be5f884f60e9ac66f38c11d92929ba367a86cdb
treeb72997a1f85ab72f2eb5df01f6888ebea27d5e3f
parent3d7882769b5dc929690f96e0c318c29b97f51018
parenteac779aa509d453a55da0ea4302bdb79c4e0854f
Merge tag 'for-linus-4.14c-rc5-tag' of git://git./linux/kernel/git/xen/tip

Pull xen fixlet from Juergen Gross:
 "A minor fix correcting the cpu hotplug name for Xen guests"

* tag 'for-linus-4.14c-rc5-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip:
  xen/vcpu: Use a unified name about cpu hotplug state for pv and pvhvm