diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2023-06-26 17:24:19 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2023-06-26 17:24:19 +0200 |
| commit | 01fee479846bb13139d339b11e04bf327200cac9 (patch) | |
| tree | 225f8e9fefe9fbac11f6a522cf72a974617c4e35 /drivers/acpi | |
| parent | Merge branches 'acpi-thermal' and 'acpi-button' (diff) | |
| parent | APEI: GHES: correctly return NULL for ghes_get_devices() (diff) | |
| parent | ACPI: PAD: mark Zhaoxin CPUs NONSTOP TSC correctly (diff) | |
| parent | ACPI: FFH: Drop the inclusion of linux/arm-smccc.h (diff) | |
| download | linux-01fee479846bb13139d339b11e04bf327200cac9.tar.xz linux-01fee479846bb13139d339b11e04bf327200cac9.zip | |
Merge branches 'acpi-apei', 'acpi-pad' and 'acpi-misc'
Merge ACPI APEI changes, an ACPI PAD driver update and an ACPI FFH
handling cleanup related to ARM64 for 6.5-rc1:
- Make ghes_get_devices() return NULL to indicate that there are no
GHES devices so as to allow vendor-specific EDAC drivers to probe
then (Li Yang).
- Mark bert_disable() as __initdata and drop an unused function from
the APEI GHES code (Miaohe Lin).
- Make the ACPI PAD (Processor Aggregator Device) driver realize that
Zhaoxin CPUs support nonstop TSC (Tony W Wang-oc).
- Drop the certainly unnecessary and likely incorrect inclusion of
linux/arm-smccc.h from acpi_ffh.c (Sudeep Holla).
* acpi-apei:
APEI: GHES: correctly return NULL for ghes_get_devices()
ACPI: APEI: mark bert_disable as __initdata
ACPI: APEI: GHES: Remove unused ghes_estatus_pool_size_request()
* acpi-pad:
ACPI: PAD: mark Zhaoxin CPUs NONSTOP TSC correctly
* acpi-misc:
ACPI: FFH: Drop the inclusion of linux/arm-smccc.h