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,
Rusty Russell <rusty@rustcorp•com.au>
Subject: linux-next: manual merge of the tip tree with the rr tree
Date: Thu, 3 Sep 2009 18:25:45 +1000 [thread overview]
Message-ID: <20090903182545.46dcd1d0.sfr@canb.auug.org.au> (raw)
Hi all,
Today's linux-next merge of the tip tree got a conflict in
arch/x86/kernel/setup.c between commit
212eddcdef19bfbe9c2178257708eb7cf17931be
("cpumask:remove-last-remaining-irqaction-mask") from the rr tree and
commit 845b3944bbdf9e9247849bf037f27ff3a3f26d87 ("x86: Add timer_init to
x86_init_ops") from the tip tree.
The latter moves the code that the former removes. I fixed it up using
the following patch (which I can carry as necessary).
From: Stephen Rothwell <sfr@canb•auug.org.au>
Subject: tip: fix merge for cupmask update
Signed-off-by: Stephen Rothwell <sfr@canb•auug.org.au>
diff --git a/arch/x86/kernel/time.c b/arch/x86/kernel/time.c
index fcece00..7883cf9 100644
--- a/arch/x86/kernel/time.c
+++ b/arch/x86/kernel/time.c
@@ -93,7 +93,6 @@ static struct irqaction irq0 = {
void __init setup_default_timer_irq(void)
{
- irq0.mask = cpumask_of_cpu(0);
setup_irq(0, &irq0);
}
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
next reply other threads:[~2009-09-03 8:25 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-09-03 8:25 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2012-08-23 2:43 linux-next: manual merge of the tip tree with the rr tree Stephen Rothwell
2012-08-23 10:52 ` Frederic Weisbecker
2012-09-28 3:33 Stephen Rothwell
2012-09-28 12:39 ` Frederic Weisbecker
2012-09-28 3: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=20090903182545.46dcd1d0.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=hpa@zytor$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mingo@elte$(echo .)hu \
--cc=peterz@infradead$(echo .)org \
--cc=rusty@rustcorp$(echo .)com.au \
--cc=tglx@linutronix$(echo .)de \
/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