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
No related branches found
No related tags found
Showing
- drivers/acpi/apei/ghes.c 1 addition, 1 deletiondrivers/acpi/apei/ghes.c
- drivers/acpi/device_pm.c 15 additions, 0 deletionsdrivers/acpi/device_pm.c
- drivers/acpi/irq.c 5 additions, 3 deletionsdrivers/acpi/irq.c
- drivers/acpi/resource.c 11 additions, 5 deletionsdrivers/acpi/resource.c
- drivers/acpi/sleep.c 8 additions, 0 deletionsdrivers/acpi/sleep.c
- drivers/acpi/thermal.c 102 additions, 109 deletionsdrivers/acpi/thermal.c
- drivers/gpio/gpiolib-acpi.c 12 additions, 3 deletionsdrivers/gpio/gpiolib-acpi.c
- drivers/gpio/gpiolib-acpi.h 2 additions, 0 deletionsdrivers/gpio/gpiolib-acpi.h
- drivers/i2c/i2c-core-acpi.c 30 additions, 10 deletionsdrivers/i2c/i2c-core-acpi.c
- drivers/i2c/i2c-core-base.c 5 additions, 1 deletiondrivers/i2c/i2c-core-base.c
- drivers/i2c/i2c-core.h 2 additions, 2 deletionsdrivers/i2c/i2c-core.h
- drivers/pnp/pnpacpi/rsparser.c 4 additions, 3 deletionsdrivers/pnp/pnpacpi/rsparser.c
- include/linux/acpi.h 18 additions, 5 deletionsinclude/linux/acpi.h
- include/linux/ioport.h 2 additions, 1 deletioninclude/linux/ioport.h
- include/linux/reboot.h 8 additions, 0 deletionsinclude/linux/reboot.h
- kernel/reboot.c 17 additions, 0 deletionskernel/reboot.c
Loading
Please register or sign in to comment