summaryrefslogtreecommitdiff
path: root/include/acpi
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2021-11-02 18:59:45 +0100
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2021-11-02 18:59:45 +0100
commit90e17edac46882ee5fa4dfb6a72956b89dd188f3 (patch)
tree7ec99908978a5af1c88604ed5f2175ae3e6c5561 /include/acpi
parentf8df16016d2d83d496f1ffa42f8d86ed7cd8db47 (diff)
parent06606646af97fa9aa0c36a723f4615157e41400a (diff)
parentc52ca713279da78881d36b49acd36288a46bbec8 (diff)
parent11ca0d6b54cd1d7e431b37128d8ad19ea5a8bd47 (diff)
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"