diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2023-04-24 18:54:02 +0300 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2023-04-24 18:54:02 +0300 |
| commit | 0f318baaf23d0feb939cf9d3251712198c429879 (patch) | |
| tree | 4a254bdb77131b8e8a1d236280cf8dfb07884c91 /include/acpi | |
| parent | 0e838286080d0f458aa20751b15f35f3a7924830 (diff) | |
| parent | f1e65718ec1855263c349997dc294e186e55d67a (diff) | |
| parent | 1fbd9029c8d5ccd3de49cb0f5382cffc7444a32b (diff) | |
| parent | 3bd554e03ef412438b42862cb088ddc4e2a2561b (diff) | |
| parent | 0dc9a715578b041b6159714f23f94cf71a214411 (diff) | |
| download | linux-0f318baaf23d0feb939cf9d3251712198c429879.tar.xz | |
Merge branches 'acpi-apei', 'acpi-properties', 'acpi-sbs' and 'acpi-thermal'
Merge ACPI APEI changes, ACPI device properties handling update, ACPI
SBS driver fixes and ACPI thermal driver cleanup for 6.4-rc1:
- Make the APEI error injection code warn on invalid arguments when
explicitly indicated by platform (Shuai Xue).
- Add CXL error types to the error injection code in APEI (Tony Luck).
- Refactor acpi_data_prop_read_single() (Andy Shevchenko).
- Fix two issues in the ACPI SBS driver (Armin Wolf).
- Replace ternary operator with min_t() in the generic ACPI thermal
zone driver (Jiangshan Yi).
* acpi-apei:
ACPI: APEI: EINJ: warn on invalid argument when explicitly indicated by platform
ACPI: APEI: EINJ: Add CXL error types
* acpi-properties:
ACPI: property: Refactor acpi_data_prop_read_single()
* acpi-sbs:
ACPI: SBS: Fix handling of Smart Battery Selectors
ACPI: EC: Fix oops when removing custom query handlers
ACPI: EC: Limit explicit removal of query handlers to custom query handlers
* acpi-thermal:
ACPI: thermal: Replace ternary operator with min_t()