linux-kernel - Re: linux-next: manual merge of the rcu tree with the pm 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] [thread-next>] [day] [month] [year] [list]

Message-ID: <3549218.iIbC2pHGDl@kreacher>
Date: Mon, 26 Feb 2024 17:52:02 +0100
From: "Rafael J. Wysocki" <rjw@...ysocki.net>
To: "Paul E. McKenney" <paulmck@...nel.org>,
 Stephen Rothwell <sfr@...b.auug.org.au>
Cc: Boqun Feng <boqun.feng@...il.com>,
 Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
 Linux Next Mailing List <linux-next@...r.kernel.org>,
 Nikhil V <quic_nprakash@...cinc.com>
Subject: Re: linux-next: manual merge of the rcu tree with the pm tree

Hi Stephen,

On Monday, February 26, 2024 3:57:45 AM CET Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the rcu tree got a conflict in:
> 
>   Documentation/admin-guide/kernel-parameters.txt
> 
> between commit:
> 
>   3fec6e5961b7 ("PM: hibernate: Support to select compression algorithm")
> 
> from the pm tree and commit:
> 
>   600716592a3a ("doc: Add EARLY flag to early-parsed kernel boot parameters")
> 
> from the rcu 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.

The conflict resolution looks good to me, thank you!