You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
JIRA: https://issues.redhat.com/browse/RHEL-113204
Conflicts:
There was a conflict in kernel/power/main.c:
bool pm_debug_messages_should_print(void)
{
<<<<<<< HEAD
return pm_debug_messages_on && pm_suspend_target_state != PM_SUSPEND_ON;
=======
return pm_debug_messages_on && (pm_suspend_in_progress() ||
hibernation_in_progress());
>>>>>>> PM: sleep: Introduce pm_suspend_in_progress()
}
EXPORT_SYMBOL_GPL(pm_debug_messages_should_print);
Since `pm_suspend_in_progress()` checks that
`pm_suspend_target_state != PM_SUSPEND_ON`, I resolved it with:
`return pm_debug_messages_on && pm_suspend_in_progress();`
commit 34a364f
Author: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Fri May 9 15:02:27 2025 +0200
PM: sleep: Introduce pm_suspend_in_progress()
Introduce pm_suspend_in_progress() to be used for checking if a system-
wide suspend or resume transition is in progress, instead of comparing
pm_suspend_target_state directly to PM_SUSPEND_ON, and use it where
applicable.
No intentional functional impact.
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Reviewed-by: Raag Jadav <raag.jadav@intel.com>
Reviewed-by: Mario Limonciello <mario.limonciello@amd.com>
Link: https://patch.msgid.link/2020901.PYKUYFuaPT@rjwysocki.net
Signed-off-by: José Expósito <jexposit@redhat.com>
0 commit comments