From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 8 Jan 2021 23:42:56 +0000 (-0800)
Subject: Merge tag 'acpi-5.11-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael... 
X-Git-Tag: accepted/tizen/unified/20230118.172025~8116
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=fb9ca0be63b49eece304f50023e736a678cc4159;p=platform%2Fkernel%2Flinux-rpi.git

Merge tag 'acpi-5.11-rc3' of git://git./linux/kernel/git/rafael/linux-pm

Pull ACPI fixes from Rafael Wysocki:
 "These address two build issues and drop confusing text from a couple
  of Kconfig entries.

  Specifics:

   - Drop two local variables that are never read and the code updating
     their values from the x86 suspend-to-idle code (Rafael Wysocki)

   - Add empty stub of an ACPI helper function to avoid build issues
     when CONFIG_ACPI is not set (Shawn Guo)

   - Remove confusing text regarding modules from Kconfig entries that
     correspond to non-modular code (Peter Robinson)"

* tag 'acpi-5.11-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  ACPI: Update Kconfig help text for items that are no longer modular
  ACPI: scan: add stub acpi_create_platform_device() for !CONFIG_ACPI
  ACPI: PM: s2idle: Drop unused local variables and related code
---

fb9ca0be63b49eece304f50023e736a678cc4159