From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Tue, 2 Nov 2021 17:59:45 +0000 (+0100)
Subject: Merge branches 'acpi-apei', 'acpi-prm' and 'acpi-docs'
X-Git-Tag: v6.1-rc5~2753^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=90e17edac46882ee5fa4dfb6a72956b89dd188f3;p=platform%2Fkernel%2Flinux-starfive.git

Merge branches 'acpi-apei', 'acpi-prm' and 'acpi-docs'

Merge APEI, PRM and documentation udpates for 5.16-rc1:

 - Mark apei_hest_parse() static (Christoph Hellwig).

 - Relax platform response timeout to 1 second after instructing it
   to inject an error (Shuai Xue).

 - Make the PRM code handle memory allocation and remapping failures
   more gracefully and drop some unnecessary blank lines from that
   code (Aubrey Li).

 - Fix spelling mistake in the ACPI documentation (Colin Ian King).

* acpi-apei:
  ACPI: APEI: mark apei_hest_parse() static
  ACPI: APEI: EINJ: Relax platform response timeout to 1 second

* acpi-prm:
  ACPI: PRM: Handle memory allocation and memory remap failure
  ACPI: PRM: Remove unnecessary blank lines

* acpi-docs:
  Documentation: ACPI: Fix spelling mistake "Millenium" -> "Millennium"
---

90e17edac46882ee5fa4dfb6a72956b89dd188f3