From: Rafael J. Wysocki Date: Mon, 31 May 2021 11:57:05 +0000 (+0200) Subject: Merge branch 'pm-cpufreq' into linux-next X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=7dc39d9dead25b19bef5acc0a188d43f5a3147ba;p=users%2Fjedix%2Flinux-maple.git Merge branch 'pm-cpufreq' into linux-next * pm-cpufreq: cpufreq: intel_pstate: hybrid: Fix build with CONFIG_ACPI unset cpufreq: acpi-cpufreq: Skip initialization if cpufreq driver is present cpufreq: sc520_freq: add 'fallthrough' to one case cpufreq: intel_pstate: Add Cometlake support in no-HWP mode cpufreq: intel_pstate: Add Icelake servers support in no-HWP mode cpufreq: intel_pstate: hybrid: CPU-specific scaling factor cpufreq: intel_pstate: hybrid: Avoid exposing two global attributes --- 7dc39d9dead25b19bef5acc0a188d43f5a3147ba