From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 6 Sep 2024 19:17:44 +0000 (-0700)
Subject: Merge tag 'pm-6.11-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
X-Git-Tag: v6.11-rc7~16
X-Git-Url: https://repo.jachan.dev/linux.git/commitdiff_plain/788220eee30d67a485a13c34c02f51a82485f337

Merge tag 'pm-6.11-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm

Pull power management fix from Rafael Wysocki:
 "Fix an incorrect warning emitted by the amd-pstate driver on
  processors that don't support X86_FEATURE_CPPC (Gautham Shenoy)"

* tag 'pm-6.11-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  cpufreq/amd-pstate: Remove warning for X86_FEATURE_CPPC on certain Zen models
---

788220eee30d67a485a13c34c02f51a82485f337