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,
"Paul E. McKenney" <paulmck@linux.vnet.ibm.com>,
Steven Rostedt <rostedt@goodmis.org>
Subject: Re: linux-next: manual merge of the sched tree
Date: Mon, 22 Dec 2008 07:35:02 +0100 [thread overview]
Message-ID: <20081222063501.GA29160@elte.hu> (raw)
In-Reply-To: <20081222120543.92004d90.sfr@canb.auug.org.au>
* Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> +#define nmi_enter() \
> + do { \
> + ftrace_nmi_enter(); \
> + lockdep_off(); \
> ++ rcu_nmi_enter(); \
> + __irq_enter(); \
> + } while (0)
> +#define nmi_exit() \
> + do { \
> + __irq_exit(); \
> ++ rcu_nmi_exit(); \
> + lockdep_on(); \
> + ftrace_nmi_exit(); \
> + } while (0)
yes, that's the same resolution i did for this conflict three days ago in
tip/master. Thanks,
Ingo
next prev parent reply other threads:[~2008-12-22 6:35 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
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 [this message]
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] <20080711112146.f7f98434.sfr@canb.auug.org.au>
2008-07-11 8:43 ` Ingo Molnar
[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=20081222063501.GA29160@elte.hu \
--to=mingo@elte.hu \
--cc=hpa@zytor.com \
--cc=linux-next@vger.kernel.org \
--cc=paulmck@linux.vnet.ibm.com \
--cc=rostedt@goodmis.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.