From: Mike Rapoport <rppt@kernel•org>
To: "Paul E. McKenney" <paulmck@kernel•org>
Cc: Stephen Rothwell <sfr@canb•auug.org.au>,
Andrew Morton <akpm@linux-foundation•org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>
Subject: Re: linux-next: manual merge of the paulmck tree with the mm-nonmm-unstable tree
Date: Tue, 29 Jul 2025 11:02:15 +0300 [thread overview]
Message-ID: <aIiABxMGqYg2bGZ5@kernel.org> (raw)
In-Reply-To: <e8191e3c-a3cf-4926-95cd-be3e3db4b86c@paulmck-laptop>
Hi Stephen,
On Mon, Jul 28, 2025 at 09:28:08PM -0700, Paul E. McKenney wrote:
> On Tue, Jul 29, 2025 at 10:42:45AM +1000, Stephen Rothwell wrote:
> > Hi all,
> >
> > Today's linux-next merge of the paulmck tree got a conflict in:
> >
> > lib/Kconfig.debug
> >
> > between commit:
> >
> > c2d288f7ab13 ("kho: add test for kexec handover")
> >
> > from the mm-nonmm-unstable tree and commit:
> >
> > d19e9fa61f60 ("lib: Add trivial kunit test for ratelimit")
> >
> > from the paulmck 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.
>
> Thank you, and this looks plausible to me.
>
> There is an extra blank line, but worse things could happen.
Yeah, what Paul said :)
> Thanx, Paul
>
> > --
> > Cheers,
> > Stephen Rothwell
> >
--
Sincerely yours,
Mike.
next prev parent reply other threads:[~2025-07-29 8:02 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-07-29 0:42 linux-next: manual merge of the paulmck tree with the mm-nonmm-unstable tree Stephen Rothwell
2025-07-29 4:28 ` Paul E. McKenney
2025-07-29 8:02 ` Mike Rapoport [this message]
2025-07-31 1:07 ` Stephen Rothwell
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=aIiABxMGqYg2bGZ5@kernel.org \
--to=rppt@kernel$(echo .)org \
--cc=akpm@linux-foundation$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=paulmck@kernel$(echo .)org \
--cc=sfr@canb$(echo .)auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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