From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 18 Jan 2022 07:13:30 +0000 (+0200)
Subject: Merge tag 'pm-5.17-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael... 
X-Git-Tag: howlett/maple/20220722_2~1379
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=8357f6fb3d9a02ac55f0d758b9c79b4647c18bcb;p=users%2Fjedix%2Flinux-maple.git

Merge tag 'pm-5.17-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm

Pull more power management updates from Rafael Wysocki:
 "This is a continuation of the rework of device power management macros
  used for declaring device power management callbacks (Paul Cercueil)"

* tag 'pm-5.17-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  iio: pressure: bmp280: Use new PM macros
  PM: runtime: Add EXPORT[_GPL]_RUNTIME_DEV_PM_OPS macros
  PM: runtime: Add DEFINE_RUNTIME_DEV_PM_OPS() macro
  PM: core: Add EXPORT[_GPL]_SIMPLE_DEV_PM_OPS macros
  PM: core: Remove static qualifier in DEFINE_SIMPLE_DEV_PM_OPS macro
  PM: core: Remove DEFINE_UNIVERSAL_DEV_PM_OPS() macro
---

8357f6fb3d9a02ac55f0d758b9c79b4647c18bcb