From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 29 Jan 2021 21:30:09 +0000 (-0800)
Subject: Merge tag 'pm-5.11-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
X-Git-Tag: microblaze-v5.13~292
X-Git-Url: http://git.monstr.eu/?a=commitdiff_plain;h=32b0c410cda19df9f0e88edcae126d0a660cf8b9;p=linux-2.6-microblaze.git

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

Pull power management fixes from Rafael Wysocki:
 "These fix a deadlock in the 'kexec jump' code and address a possible
  hibernation image creation issue.

  Specifics:

   - Fix a deadlock caused by attempting to acquire the same mutex twice
     in a row in the "kexec jump" code (Baoquan He)

   - Modify the hibernation image saving code to flush the unwritten
     data to the swap storage later so as to avoid failing to write the
     image signature which is possible in some cases (Laurent Badel)"

* tag 'pm-5.11-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  PM: hibernate: flush swap writer after marking
  kernel: kexec: remove the lock operation of system_transition_mutex
---

32b0c410cda19df9f0e88edcae126d0a660cf8b9