summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2023-11-24 21:16:22 +0300
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2023-11-24 21:16:22 +0300
commite37470624e008579fec020c6be062dd200877129 (patch)
tree3035f43db6e037eee0632c1ff1b0d779366adb40
parentbd911485294a6f0596e4592ed442438015cffc8a (diff)
parentc93695494606326d7fd72b46a2a657139ccb0dec (diff)
parent9bb69ba4c177dccaa1f5b5cbdf80b67813328348 (diff)
downloadlinux-e37470624e008579fec020c6be062dd200877129.tar.xz
Merge branches 'acpi-video' and 'acpi-processor' into acpi
Merge ACPI backlight driver fixes and an ACPI processor driver fix for 6.7-rc3: - Avoid powering up GPUs while attempting to fix up power for their children (Hans de Goede). - Use raw_safe_halt() instead of safe_halt() in acpi_idle_play_dead() so as to avoid triple-falts during CPU online in Xen HVM guests due to the setting of the hardirqs_enabled flag in safe_halt() (David Woodhouse). * acpi-video: ACPI: video: Use acpi_device_fix_up_power_children() ACPI: PM: Add acpi_device_fix_up_power_children() function * acpi-processor: ACPI: processor_idle: use raw_safe_halt() in acpi_idle_play_dead()