From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 19 Nov 2020 19:15:15 +0000 (-0800)
Subject: Merge tag 'acpi-5.10-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael... 
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=131ad0b6f5294dd4eb1c8e5e5c611a85cbae0c4e;p=linux.git

Merge tag 'acpi-5.10-rc5' of git://git./linux/kernel/git/rafael/linux-pm

Pull ACPI fixes from Rafael Wysocki:
 "These fix recent regression in the APEI code and initialization issue
  in the ACPI fan driver.

  Specifics:

   - Make the APEI code avoid attempts to obtain logical addresses for
     registers located in the I/O address space to fix initialization
     issues (Aili Yao)

   - Fix sysfs attribute initialization in the ACPI fan driver (Guenter
     Roeck)"

* tag 'acpi-5.10-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  ACPI, APEI, Fix error return value in apei_map_generic_address()
  ACPI: fan: Initialize performance state sysfs attribute
---

131ad0b6f5294dd4eb1c8e5e5c611a85cbae0c4e