summaryrefslogtreecommitdiff
path: root/drivers/acpi
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2023-06-26 18:24:19 +0300
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2023-06-26 18:24:19 +0300
commit01fee479846bb13139d339b11e04bf327200cac9 (patch)
tree225f8e9fefe9fbac11f6a522cf72a974617c4e35 /drivers/acpi
parent0586d26339ed4a84cfd60333daadb853663066fd (diff)
parent9368aa1882ac7178adcd936cee5f0899dbf76dc4 (diff)
parentb72f301c5bdce11ef32a7363bdc05edd4fc3b386 (diff)
parent097e727b585a9031e04e5c883e02c05ee8c6c901 (diff)
downloadlinux-01fee479846bb13139d339b11e04bf327200cac9.tar.xz
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