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 [thread overview]
Message-ID: <3549218.iIbC2pHGDl@kreacher> (raw)
In-Reply-To: <20240226135745.12ac854d@canb.auug.org.au>
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!
next prev parent reply other threads:[~2024-02-26 16:52 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-02-26 2:57 linux-next: manual merge of the rcu tree with the pm tree Stephen Rothwell
2024-02-26 16:52 ` Rafael J. Wysocki [this message]
2024-02-29 4:59 ` Boqun Feng
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=3549218.iIbC2pHGDl@kreacher \
--to=rjw@rjwysocki.net \
--cc=boqun.feng@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=paulmck@kernel.org \
--cc=quic_nprakash@quicinc.com \
--cc=sfr@canb.auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox