From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 20 Jul 2018 18:12:27 +0000 (-0700)
Subject: Merge tag 'pm-4.18-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
X-Git-Tag: v4.19~596
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=bfa54a3a00e2f7ff051a50f3957e4fca3d73f6e7;p=platform%2Fkernel%2Flinux-rpi3.git

Merge tag 'pm-4.18-rc6' of git://git./linux/kernel/git/rafael/linux-pm

Pull power management fix from Rafael Wysocki:
 "Fix a relatively old initialization issue in intel_pstate causing the
  pcc-cpufreq driver to be used instead of it on some HP Proliant
  systems.

  This turned into a functional regression during the 4.17 cycle,
  because pcc-cpufreq is a scalability disaster and that was amplified
  by the idle loop rework done at that time (Rafael Wysocki).

* tag 'pm-4.18-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  cpufreq: intel_pstate: Register when ACPI PCCH is present
---

bfa54a3a00e2f7ff051a50f3957e4fca3d73f6e7