From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 21 Dec 2021 20:31:55 +0000 (-0800)
Subject: Merge tag 'pm-5.16-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
X-Git-Tag: baikal/mips/sdk6.1~6825
X-Git-Url: https://git.baikalelectronics.ru/sdk/?a=commitdiff_plain;h=1eaa64cc722d5e5b0e344611ef93f8158ab8d364;p=kernel.git

Merge tag 'pm-5.16-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm

Pull power management fix from Rafael Wysocki:
 "Fix a recent regression causing the loop in dpm_prepare() to become
  infinite if one of the device ->prepare() callbacks returns an error"

* tag 'pm-5.16-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  PM: sleep: Fix error handling in dpm_prepare()
---

1eaa64cc722d5e5b0e344611ef93f8158ab8d364