Received-SPF: pass (google.com: domain of linux-kernel+bounces-81945-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) client-ip=147.75.80.249;
From: "Rafael J. Wysocki" <rjw@rjwysocki.net>
To: "Paul E. McKenney" <paulmck@kernel.org>,
 Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Boqun Feng <boqun.feng@gmail.com>,
 Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
 Linux Next Mailing List <linux-next@vger.kernel.org>,
 Nikhil V <quic_nprakash@quicinc.com>
Subject: Re: linux-next: manual merge of the rcu tree with the pm tree
Date: Mon, 26 Feb 2024 17:52:02 +0100
Message-ID: <3549218.iIbC2pHGDl@kreacher>
In-Reply-To: <20240226135745.12ac854d@canb.auug.org.au>
References: <20240226135745.12ac854d@canb.auug.org.au>
Precedence: bulk
MIME-Version: 1.0
Content-Transfer-Encoding: 7Bit
Content-Type: text/plain; charset="UTF-8"

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!