Merge tag 'acpi-5.15-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 24 Sep 2021 18:17:32 +0000 (11:17 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 24 Sep 2021 18:17:32 +0000 (11:17 -0700)
commitea1f9163ac83fa537f58e00a81028844702279e4
treee2c969f01e37203f0cbe27e18cf6527a73fab86f
parent1b7eaf570140281a1aa898a875aa587d48d96958
parent12064c1768439fa0882547010afae6b52aafa7af
Merge tag 'acpi-5.15-rc3' of git://git./linux/kernel/git/rafael/linux-pm

Pull ACPI fix from Rafael Wysocki:
 "Revert a recent commit related to memory management that turned out to
  be problematic (Jia He)"

* tag 'acpi-5.15-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  Revert "ACPI: Add memory semantics to acpi_os_map_memory()"