From: Ingo Molnar <mingo@elte.hu>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Thomas Gleixner <tglx@linutronix.de>,
"H. Peter Anvin" <hpa@zytor.com>,
linux-next@vger.kernel.org, Nick Piggin <nickpiggin@yahoo.com.au>,
"Paul E. McKenney" <paulmck@linux.vnet.ibm.com>
Subject: Re: linux-next: manual merge of the sched tree
Date: Fri, 11 Jul 2008 10:43:33 +0200 [thread overview]
Message-ID: <20080711084333.GA17217@elte.hu> (raw)
In-Reply-To: <20080711112146.f7f98434.sfr@canb.auug.org.au>
* Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi all,
>
> Today's linux-next merge of the sched tree got a conflict in
> kernel/rcupreempt.c between commit
> 70ff05554f91a1edda1f11684da1dbde09e2feea ("Fix PREEMPT_RCU without
> HOTPLUG_CPU") from Linus' tree and commit
> 4446a36ff8c74ac3b32feb009b651048e129c6af ("rcu: add call_rcu_sched()")
> from the sched tree.
>
> The former moved rcu_online_cpu() out of the CONFIG_HOTPLUG_CPU ifdef
> and mode it __cpuinit, while the latter updated it. I applied the
> latter updates to the newly positioned function. This may well not be
> correct but it does build. Please check.
yeah, that's how i resolved it too.
Ingo
next parent reply other threads:[~2008-07-11 8:43 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20080711112146.f7f98434.sfr@canb.auug.org.au>
2008-07-11 8:43 ` Ingo Molnar [this message]
2008-12-22 1:05 linux-next: manual merge of the sched tree Stephen Rothwell
2008-12-22 1:46 ` Paul E. McKenney
2008-12-22 6:35 ` Ingo Molnar
2008-12-30 23:45 ` Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2008-11-19 1:27 Stephen Rothwell
2008-11-19 8:45 ` Ingo Molnar
2008-11-19 9:29 ` Stephen Rothwell
2008-07-22 1:58 Stephen Rothwell
2008-07-22 1:54 Stephen Rothwell
2008-07-22 8:28 ` Stephen Rothwell
2008-07-22 9:13 ` Ingo Molnar
2008-07-22 11:07 ` Stephen Rothwell
[not found] <20080707142114.7985a9dd.sfr@canb.auug.org.au>
2008-07-07 6:02 ` Ingo Molnar
2008-07-07 6:16 ` Ingo Molnar
2008-07-07 6:41 ` Stephen Rothwell
2008-07-07 7:04 ` Ingo Molnar
2008-07-07 6:35 ` Stephen Rothwell
[not found] ` <20080707145027.0d83038e.sfr@canb.auug.org.au>
2008-07-07 6:10 ` Ingo Molnar
2008-07-07 6:37 ` Stephen Rothwell
2008-07-01 2:42 Stephen Rothwell
2008-07-01 5:54 ` Ingo Molnar
2008-07-01 6:00 ` Stephen Rothwell
2008-07-01 6:08 ` Ingo Molnar
2008-06-25 1:55 Stephen Rothwell
2008-06-25 9:36 ` Ingo Molnar
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=20080711084333.GA17217@elte.hu \
--to=mingo@elte.hu \
--cc=hpa@zytor.com \
--cc=linux-next@vger.kernel.org \
--cc=nickpiggin@yahoo.com.au \
--cc=paulmck@linux.vnet.ibm.com \
--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.