From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Mon, 26 Jun 2023 15:24:19 +0000 (+0200)
Subject: Merge branches 'acpi-apei', 'acpi-pad' and 'acpi-misc'
X-Git-Tag: v6.6.7~2586^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=01fee479846bb13139d339b11e04bf327200cac9;p=platform%2Fkernel%2Flinux-starfive.git

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
---

01fee479846bb13139d339b11e04bf327200cac9