diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2021-06-29 16:53:07 +0300 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2021-06-29 16:53:07 +0300 |
| commit | ed562d280cb775ae4ba940bb4b81a1fbcfb303cb (patch) | |
| tree | 88cd692d1e850c122ffb68cb69190c1a12275412 /Documentation | |
| parent | afe94fb82c113727de211e32af88982534ba8b0c (diff) | |
| parent | 3b7180573c250eb6e2a7eec54ae91f27472332ea (diff) | |
| parent | 795e0e38de2c36561a4f14e6e97b8a82f6f2e03c (diff) | |
| download | linux-ed562d280cb775ae4ba940bb4b81a1fbcfb303cb.tar.xz | |
Merge branches 'pm-cpufreq' and 'pm-cpuidle'
* pm-cpufreq:
cpufreq: Make cpufreq_online() call driver->offline() on errors
cpufreq: loongson2: Remove unused linux/sched.h headers
cpufreq: sh: Remove unused linux/sched.h headers
cpufreq: stats: Clean up local variable in cpufreq_stats_create_table()
cpufreq: intel_pstate: hybrid: Fix build with CONFIG_ACPI unset
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
* pm-cpuidle:
cpuidle: teo: remove unneeded semicolon in teo_select()
cpuidle: teo: Use kerneldoc documentation in admin-guide
cpuidle: teo: Rework most recent idle duration values treatment
cpuidle: teo: Change the main idle state selection logic
cpuidle: teo: Cosmetic modification of teo_select()
cpuidle: teo: Cosmetic modifications of teo_update()
intel_idle: Adjust the SKX C6 parameters if PC6 is disabled