From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Tue, 29 Jun 2021 13:53:07 +0000 (+0200)
Subject: Merge branches 'pm-cpufreq' and 'pm-cpuidle'
X-Git-Tag: microblaze-v5.15~145^2~1
X-Git-Url: http://git.monstr.eu/?a=commitdiff_plain;h=ed562d280cb775ae4ba940bb4b81a1fbcfb303cb;p=linux-2.6-microblaze.git

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
---

ed562d280cb775ae4ba940bb4b81a1fbcfb303cb