From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Thu, 30 Oct 2025 19:25:18 +0000 (+0100)
Subject: Merge branches 'pm-cpuidle' and 'pm-sleep'
X-Git-Tag: v6.18-rc4~22^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=590c5cd10675a6ae49f6019502dec5c87aba07e4;p=thirdparty%2Fkernel%2Fstable.git

Merge branches 'pm-cpuidle' and 'pm-sleep'

Merge a cpuidle fix and two fixes related to system sleep for 6.18-rc4:

 - Add an exit latency check to the menu cpuidle governor in the case
   when it considers using a real idle state instead of a polling one to
   address a performance regression (Rafael Wysocki)

 - Revert an attempted cleanup of a system suspend code path that
   introduced a regression elsewhere (Samuel Wu)

 - Allow pm_restrict_gfp_mask() to be called multiple times in a row
   and adjust pm_restore_gfp_mask() accordingly to avoid having to play
   nasty games with these calls during hibernation (Rafael Wysocki)

* pm-cpuidle:
  cpuidle: governors: menu: Select polling state in some more cases

* pm-sleep:
  PM: sleep: Allow pm_restrict_gfp_mask() stacking
  Revert "PM: sleep: Make pm_wakeup_clear() call more clear"
---

590c5cd10675a6ae49f6019502dec5c87aba07e4