summaryrefslogtreecommitdiff
path: root/kernel
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2022-10-10 18:11:11 +0200
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2022-10-10 18:11:11 +0200
commit056a81549c2722f0e7a9cceb7a98728eb1d67434 (patch)
treeebd5a7208c6ea4373bc3407e0dce8c339aba247f /kernel
parent800b8eecb284eb0f1d213dae5d00b4f372b7353a (diff)
parent415fed694fe11395df56e05022d6e7cee1d39dd3 (diff)
parenta6c05e1223c9f32836ee8df3d66208b869e5b5d7 (diff)
parent38f34dba806a4cb54ef3b2256948e770699a5769 (diff)
parent36f554046bd6da91b7e71bddeb38952c6d92cd98 (diff)
Merge branches 'acpi-apei', 'acpi-wakeup', 'acpi-reboot' and 'acpi-thermal'
Merge additional APEI changes, ACPI updates related to device wakeup and system restart and ACPI thermal driver cleanups for 6.1-rc1: - Fix a memory leak in APEI by avoiding to add do not add task_work to kernel threads running when an asynchronous error is detected (Shuai Xue). - Add ACPI support for handling system wakeups via GPIO wake capable IRQs in addition to GPEs (Raul E Rangel). - Make the system reboot code put ACPI-enabled systems into the S5 (system off) state which is necessary for some platforms to work as expected (Kai-Heng Feng). - Make the white space usage in the ACPI thermal driver more consistent and drop redundant code from it (Rafael Wysocki). * acpi-apei: ACPI: APEI: do not add task_work to kernel thread to avoid memory leak * acpi-wakeup: ACPI: PM: Take wake IRQ into consideration when entering suspend-to-idle i2c: acpi: Use ACPI wake capability bit to set wake_irq ACPI: resources: Add wake_capable parameter to acpi_dev_irq_flags gpiolib: acpi: Add wake_capable variants of acpi_dev_gpio_irq_get * acpi-reboot: PM: ACPI: reboot: Reinstate S5 for reboot kernel/reboot: Add SYS_OFF_MODE_RESTART_PREPARE mode * acpi-thermal: ACPI: thermal: Drop some redundant code ACPI: thermal: Drop redundant parens from expressions ACPI: thermal: Use white space more consistently