From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 15 Apr 2021 17:53:39 +0000 (-0700)
Subject: Merge tag 'acpi-5.12-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael... 
X-Git-Tag: ceph-for-5.13-rc1~60
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=7e25f40eab52c57ff6772d27d2aef3640a3237d7;p=ceph-client.git

Merge tag 'acpi-5.12-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm

Pull ACPI fix from Rafael Wysocki:
 "Restore the initrd-based ACPI table override functionality broken by
  one of the recent fixes"

* tag 'acpi-5.12-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  ACPI: x86: Call acpi_boot_table_init() after acpi_table_upgrade()
---

7e25f40eab52c57ff6772d27d2aef3640a3237d7