From: Benjamin Herrenschmidt <benh@kernel.crashing.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Thomas Gleixner <tglx@linutronix.de>, Ingo Molnar <mingo@elte.hu>,
"H. Peter Anvin" <hpa@zytor.com>,
Peter Zijlstra <peterz@infradead.org>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Milton Miller <miltonm@bga.com>,
Paul Mackerras <paulus@samba.org>,
linuxppc-dev@lists.ozlabs.org
Subject: Re: linux-next: manual merge of the tip tree with the powerpc tree
Date: Fri, 20 May 2011 15:38:24 +1000 [thread overview]
Message-ID: <1305869904.7481.145.camel@pasglop> (raw)
In-Reply-To: <20110520141425.dd38cb7d.sfr@canb.auug.org.au>
On Fri, 2011-05-20 at 14:14 +1000, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the tip tree got a conflict in
> arch/powerpc/kernel/smp.c between commit 23d72bfd8f9f ("powerpc:
> Consolidate ipi message mux and demux") from the powerpc tree and commit
> 184748cc50b2 ("sched: Provide scheduler_ipi() callback in response to
> smp_send_reschedule()") from the tip tree.
>
> The former superceded part of the latter's changes, so I just used the
> former for that.
I've done the merge and resolved the conflict properly (it's actually
non trivial due to some other changes) in the powerpc tree, I'll send a
pull request to Linus later today.
Cheers,
Ben.
WARNING: multiple messages have this Message-ID (diff)
From: Benjamin Herrenschmidt <benh@kernel.crashing.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Peter Zijlstra <peterz@infradead.org>,
linux-kernel@vger.kernel.org, Milton Miller <miltonm@bga.com>,
linux-next@vger.kernel.org, Paul Mackerras <paulus@samba.org>,
"H. Peter Anvin" <hpa@zytor.com>,
Thomas Gleixner <tglx@linutronix.de>,
linuxppc-dev@lists.ozlabs.org, Ingo Molnar <mingo@elte.hu>
Subject: Re: linux-next: manual merge of the tip tree with the powerpc tree
Date: Fri, 20 May 2011 15:38:24 +1000 [thread overview]
Message-ID: <1305869904.7481.145.camel@pasglop> (raw)
In-Reply-To: <20110520141425.dd38cb7d.sfr@canb.auug.org.au>
On Fri, 2011-05-20 at 14:14 +1000, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the tip tree got a conflict in
> arch/powerpc/kernel/smp.c between commit 23d72bfd8f9f ("powerpc:
> Consolidate ipi message mux and demux") from the powerpc tree and commit
> 184748cc50b2 ("sched: Provide scheduler_ipi() callback in response to
> smp_send_reschedule()") from the tip tree.
>
> The former superceded part of the latter's changes, so I just used the
> former for that.
I've done the merge and resolved the conflict properly (it's actually
non trivial due to some other changes) in the powerpc tree, I'll send a
pull request to Linus later today.
Cheers,
Ben.
next prev parent reply other threads:[~2011-05-20 5:39 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-05-20 4:14 linux-next: manual merge of the tip tree with the powerpc tree Stephen Rothwell
2011-05-20 4:14 ` Stephen Rothwell
2011-05-20 4:14 ` Stephen Rothwell
2011-05-20 5:38 ` Benjamin Herrenschmidt [this message]
2011-05-20 5:38 ` Benjamin Herrenschmidt
-- strict thread matches above, loose matches on Subject: below --
2026-04-03 14:42 Mark Brown
2022-03-15 2:08 Stephen Rothwell
2022-03-15 2:08 ` Stephen Rothwell
2017-11-01 5:53 Stephen Rothwell
2017-11-01 18:12 ` Kees Cook
2017-04-26 4:01 Stephen Rothwell
2017-02-17 1:48 Stephen Rothwell
2017-02-21 22:15 ` Stephen Rothwell
2012-03-09 4:40 Stephen Rothwell
2012-03-09 4:40 ` Stephen Rothwell
2012-03-09 4:40 ` Stephen Rothwell
2010-10-19 4:48 Stephen Rothwell
2010-10-19 4:48 ` Stephen Rothwell
2010-10-19 4:48 ` Stephen Rothwell
2010-10-19 4:56 ` Stephen Rothwell
2010-10-19 4:56 ` Stephen Rothwell
2010-10-19 4:56 ` Stephen Rothwell
2010-07-28 4:38 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=1305869904.7481.145.camel@pasglop \
--to=benh@kernel.crashing.org \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=miltonm@bga.com \
--cc=mingo@elte.hu \
--cc=paulus@samba.org \
--cc=peterz@infradead.org \
--cc=sfr@canb.auug.org.au \
--cc=tglx@linutronix.de \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.