From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 7 Mar 2025 22:17:42 +0000 (-1000)
Subject: Merge tag 'acpi-6.14-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael... 
X-Git-Tag: v6.14-rc6~11
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d4fd25b6f883db41194e1760041560779d412d98;p=thirdparty%2Fkernel%2Flinux.git

Merge tag 'acpi-6.14-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm

Pull ACPI fix from Rafael Wysocki:
 "Restore the previous behavior of the ACPI platform_profile sysfs
  interface that has been changed recently in a way incompatible with
  the existing user space (Mario Limonciello)"

* tag 'acpi-6.14-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  platform/x86/amd: pmf: Add balanced-performance to hidden choices
  platform/x86/amd: pmf: Add 'quiet' to hidden choices
  ACPI: platform_profile: Add support for hidden choices
---

d4fd25b6f883db41194e1760041560779d412d98