aboutsummaryrefslogtreecommitdiff
path: root/drivers/iio
diff options
context:
space:
mode:
authorRafael J. Wysocki2023-04-24 17:54:02 +0200
committerRafael J. Wysocki2023-04-24 17:54:02 +0200
commit0f318baaf23d0feb939cf9d3251712198c429879 (patch)
tree4a254bdb77131b8e8a1d236280cf8dfb07884c91 /drivers/iio
parent0e838286080d0f458aa20751b15f35f3a7924830 (diff)
parentf1e65718ec1855263c349997dc294e186e55d67a (diff)
parent1fbd9029c8d5ccd3de49cb0f5382cffc7444a32b (diff)
parent3bd554e03ef412438b42862cb088ddc4e2a2561b (diff)
parent0dc9a715578b041b6159714f23f94cf71a214411 (diff)
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()