From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Thomas Gleixner <tglx@linutronix.de>, Ingo Molnar <mingo@elte.hu>,
"H. Peter Anvin" <hpa@zytor.com>,
Peter Zijlstra <peterz@infradead.org>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Milton Miller <miltonm@bga.com>,
Benjamin Herrenschmidt <benh@kernel.crashing.org>,
Paul Mackerras <paulus@samba.org>,
<linuxppc-dev@lists.ozlabs.org>
Subject: linux-next: manual merge of the tip tree with the powerpc tree
Date: Fri, 20 May 2011 14:14:25 +1000 [thread overview]
Message-ID: <20110520141425.dd38cb7d.sfr@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 525 bytes --]
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.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]
WARNING: multiple messages have this Message-ID (diff)
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Thomas Gleixner <tglx@linutronix.de>, Ingo Molnar <mingo@elte.hu>,
"H. Peter Anvin" <hpa@zytor.com>,
Peter Zijlstra <peterz@infradead.org>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Milton Miller <miltonm@bga.com>,
Benjamin Herrenschmidt <benh@kernel.crashing.org>,
Paul Mackerras <paulus@samba.org>,
linuxppc-dev@lists.ozlabs.org
Subject: linux-next: manual merge of the tip tree with the powerpc tree
Date: Fri, 20 May 2011 14:14:25 +1000 [thread overview]
Message-ID: <20110520141425.dd38cb7d.sfr@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 525 bytes --]
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.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]
WARNING: multiple messages have this Message-ID (diff)
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Thomas Gleixner <tglx@linutronix.de>, Ingo Molnar <mingo@elte.hu>,
"H. Peter Anvin" <hpa@zytor.com>,
Peter Zijlstra <peterz@infradead.org>
Cc: linux-kernel@vger.kernel.org, Milton Miller <miltonm@bga.com>,
linux-next@vger.kernel.org, Paul Mackerras <paulus@samba.org>,
linuxppc-dev@lists.ozlabs.org
Subject: linux-next: manual merge of the tip tree with the powerpc tree
Date: Fri, 20 May 2011 14:14:25 +1000 [thread overview]
Message-ID: <20110520141425.dd38cb7d.sfr@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 525 bytes --]
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.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]
next reply other threads:[~2011-05-20 4:14 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-05-20 4:14 Stephen Rothwell [this message]
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 5:38 ` Benjamin Herrenschmidt
2011-05-20 5:38 ` Benjamin Herrenschmidt
-- strict thread matches above, loose matches on Subject: below --
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=20110520141425.dd38cb7d.sfr@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=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=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.