summaryrefslogtreecommitdiff
path: root/include/linux
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2026-02-05 15:03:47 +0100
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2026-02-05 15:03:47 +0100
commit1a91d4e27d67d87673a0f2c1f90a98ae67b89885 (patch)
treeb9be409aa4da143615efca49613fda8a9becebcc /include/linux
parent7c8b81f594b8a19e14a937be1e04ac199defa9c2 (diff)
parentbb1256e0ddc7e9e406164319769b9f8d8389f056 (diff)
parentb0c8ac52da5a1c00bb9ffdc231cbf2222297688d (diff)
Merge branches 'acpi-battery' and 'acpi-misc'
Merge ACPI battery driver changes and a generic ACPI watchdog device driver change for 6.20-rc1/7.0-rc1: - Convert the generic ACPI battery driver to a proper platform driver using struct platform_driver for device binding (Rafael Wysocki) - Fix incorrect charging status when current is zero in the generic ACPI battery driver (Ata İlhan Köktürk) - Use LIST_HEAD() for initializing a stack-allocated list in the generic ACPI watchdog device driver (Can Peng) * acpi-battery: ACPI: battery: fix incorrect charging status when current is zero ACPI: battery: Convert the driver to a platform one ACPI: battery: Reduce code duplication related to cleanup ACPI: battery: Adjust event notification routine * acpi-misc: ACPI: acpi_watchdog: use LIST_HEAD for stack-allocated list