Merge branch 'pm-x86'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Fri, 7 Jun 2019 08:48:57 +0000 (10:48 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Fri, 7 Jun 2019 08:48:57 +0000 (10:48 +0200)
commita964d23c94e8177c501fc9a37dcf1f0dd2750527
tree0ed074be3f49c598167e3e134a0cc4f0f49b2ea6
parenta61373476127edac8bcc5ee9d68a74dc1b864f53
parentec527c318036a65a083ef68d8ba95789d2212246
Merge branch 'pm-x86'

* pm-x86:
  x86/power: Fix 'nosmt' vs hibernation triple fault during resume
  x86: intel_epb: Do not build when CONFIG_PM is unset
kernel/power/hibernate.c