]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
Merge tag 'pm-6.18-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 20 Nov 2025 17:46:52 +0000 (09:46 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 20 Nov 2025 17:46:52 +0000 (09:46 -0800)
Pull power management fix from Rafael Wysocki:
 "Fix a regression introduced during the 6.16 development cycle that may
  cause runtime PM to be enabled by mistake for devices that do not
  support it (which may lead to some serious trouble) if there is a
  system wakeup event during the "late suspend" phase of system suspend"

* tag 'pm-6.18-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  PM: sleep: core: Fix runtime PM enabling in device_resume_early()


Trivial merge