linux-kernel - Re: linux-next: manual merge of the pm tree with Linus' tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <CAJZ5v0h84Ev_diV4thNZRqEfmqFDXXszR5Z5CVXuWtotn9kQyw@mail.gmail.com>
Date: Mon, 24 Nov 2025 11:32:26 +0100
From: "Rafael J. Wysocki" <rafael@...nel.org>
To: Stephen Rothwell <sfr@...b.auug.org.au>
Cc: "Rafael J. Wysocki" <rafael@...nel.org>, Christian Brauner <brauner@...nel.org>, 
	Linux Kernel Mailing List <linux-kernel@...r.kernel.org>, 
	Linux Next Mailing List <linux-next@...r.kernel.org>, 
	"Rafael J. Wysocki" <rafael.j.wysocki@...el.com>, Samuel Wu <wusamuel@...gle.com>
Subject: Re: linux-next: manual merge of the pm tree with Linus' tree

Hi,

On Mon, Nov 24, 2025 at 2:39 AM Stephen Rothwell <sfr@...b.auug.org.au> wrote:
>
> Hi all,
>
> Today's linux-next merge of the pm tree got a conflict in:
>
>   kernel/power/hibernate.c
>
> between commit:
>
>   a3f8f8662771 ("power: always freeze efivarfs")
>
> from Linus' tree and commit:
>
>   8e2d57e6539b ("PM: sleep: Call pm_sleep_fs_sync() instead of ksys_sync_helper()")
>
> from the pm tree.
>
> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging.  You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.
>
> --
> Cheers,
> Stephen Rothwell
>
> diff --cc kernel/power/hibernate.c
> index 26e45f86b955,7fed1cd36e4d..000000000000
> --- a/kernel/power/hibernate.c
> +++ b/kernel/power/hibernate.c
> @@@ -820,8 -820,12 +820,11 @@@ int hibernate(void
>         if (error)
>                 goto Restore;
>
> -       ksys_sync_helper();
> +       error = pm_sleep_fs_sync();
> +       if (error)
> +               goto Notify;
> +
>  -      if (filesystem_freeze_enabled)
>  -              filesystems_freeze();
>  +      filesystems_freeze(filesystem_freeze_enabled);
>
>         error = freeze_processes();
>         if (error)

Thanks for resolving this, it looks good to me.