From: Linus Torvalds Date: Fri, 27 Jan 2017 01:14:17 +0000 (-0800) Subject: Merge tag 'pm-4.10-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm X-Git-Tag: v5.15~12027 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=7d3a0fa52e4d9fa2cfe04a5f6e21d1d78169edb5;p=platform%2Fkernel%2Flinux-starfive.git Merge tag 'pm-4.10-rc6' of git://git./linux/kernel/git/rafael/linux-pm Pull power management fixes from Rafael Wysocki: "These fix two regressions introduced recently, one by reverting the problematic commit and one by fixing up the behavior in an overlooked case. Specifics: - Revert the recent change that caused suspend-to-idle to be used as the default suspend method on systems where it is indicated to be efficient by the ACPI tables, as that turned out to be premature and introduced suspend regressions on some systems with missing power management support in device drivers (Rafael Wysocki). - Fix up the intel_pstate driver to take changes of the global limits via sysfs correctly when the performance policy is used which has been broken by a recent change in it (Srinivas Pandruvada)" * tag 'pm-4.10-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm: cpufreq: intel_pstate: Fix sysfs limits enforcement for performance policy Revert "PM / sleep / ACPI: Use the ACPI_FADT_LOW_POWER_S0 flag" --- 7d3a0fa52e4d9fa2cfe04a5f6e21d1d78169edb5