From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 20 Aug 2021 20:44:25 +0000 (-0700)
Subject: Merge tag 'acpi-5.14-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael... 
X-Git-Tag: accepted/tizen/unified/20230118.172025~6632
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=fa54d366a6e4fe3e16322abdb8b5115f8be0da8b;p=platform%2Fkernel%2Flinux-rpi.git

Merge tag 'acpi-5.14-rc7' of git://git./linux/kernel/git/rafael/linux-pm

Pull ACPI fixes from Rafael Wysocki:
 "These fix two mistakes in new code.

  Specifics:

   - Prevent confusing messages from being printed if the PRMT table is
     not present or there are no PRM modules (Aubrey Li).

   - Fix the handling of suspend-to-idle entry and exit in the case when
     the Microsoft UUID is used with the Low-Power S0 Idle _DSM
     interface (Mario Limonciello)"

* tag 'acpi-5.14-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  ACPI: PM: s2idle: Invert Microsoft UUID entry and exit
  ACPI: PRM: Deal with table not present or no module found
---

fa54d366a6e4fe3e16322abdb8b5115f8be0da8b