From: Thomas Gleixner <tglx@linutronix.de>
To: paulmck@kernel.org, Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Michael Ellerman <mpe@ellerman.id.au>,
PowerPC <linuxppc-dev@lists.ozlabs.org>,
Peter Zijlstra <peterz@infradead.org>,
Ingo Molnar <mingo@elte.hu>, "H. Peter Anvin" <hpa@zytor.com>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Nicholas Piggin <npiggin@gmail.com>
Subject: Re: linux-next: manual merge of the rcu tree with the powerpc tree
Date: Thu, 21 May 2020 22:38:35 +0200 [thread overview]
Message-ID: <87h7w9t450.fsf@nanos.tec.linutronix.de> (raw)
In-Reply-To: <20200521133543.GX2869@paulmck-ThinkPad-P72>
"Paul E. McKenney" <paulmck@kernel.org> writes:
> On Thu, May 21, 2020 at 02:51:24PM +1000, Stephen Rothwell wrote:
>> Hi all,
>>
>> On Tue, 19 May 2020 17:23:16 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>> >
>> > Today's linux-next merge of the rcu tree got a conflict in:
>> >
>> > arch/powerpc/kernel/traps.c
>> >
>> > between commit:
>> >
>> > 116ac378bb3f ("powerpc/64s: machine check interrupt update NMI accounting")
>> >
>> > from the powerpc tree and commit:
>> >
>> > 187416eeb388 ("hardirq/nmi: Allow nested nmi_enter()")
>> >
>> > from the rcu tree.
>> >
>> > I fixed it up (I used the powerpc tree version for now) 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.
>>
>> This is now a conflict between the powerpc commit and commit
>>
>> 69ea03b56ed2 ("hardirq/nmi: Allow nested nmi_enter()")
>>
>> from the tip tree. I assume that the rcu and tip trees are sharing
>> some patches (but not commits) :-(
>
> We are sharing commits, and in fact 187416eeb388 in the rcu tree came
> from the tip tree. My guess is version skew, and that I probably have
> another rebase coming up.
>
> Why is this happening? There are sets of conflicting commits in different
> efforts, and we are trying to resolve them. But we are getting feedback
> on some of those commits, which is probably what is causing the skew.
Correct. We had to rebase that. I don't think we do it again. The
changes I just sent out are carefully crafted to avoid that.
Thanks,
tglx
next prev parent reply other threads:[~2020-05-21 20:38 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-19 7:23 linux-next: manual merge of the rcu tree with the powerpc tree Stephen Rothwell
2020-05-20 4:12 ` Michael Ellerman
2020-05-21 4:51 ` Stephen Rothwell
2020-05-21 13:35 ` Paul E. McKenney
2020-05-21 20:38 ` Thomas Gleixner [this message]
2020-06-03 2:02 ` Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2017-02-03 2:03 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=87h7w9t450.fsf@nanos.tec.linutronix.de \
--to=tglx@linutronix.de \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=mingo@elte.hu \
--cc=mpe@ellerman.id.au \
--cc=npiggin@gmail.com \
--cc=paulmck@kernel.org \
--cc=peterz@infradead.org \
--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;
as well as URLs for NNTP newsgroup(s).