From: Ingo Molnar <mingo@elte.hu>
To: Steven Rostedt <rostedt@goodmis.org>
Cc: Peter Zijlstra <peterz@infradead.org>,
linux-kernel@vger.kernel.org,
Andrew Morton <akpm@linux-foundation.org>,
Frederic Weisbecker <fweisbec@gmail.com>,
Steven Rostedt <srostedt@redhat.com>,
Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca>
Subject: Re: [PATCH 2/4] nmi: add generic nmi tracking state
Date: Fri, 6 Feb 2009 16:16:59 +0100 [thread overview]
Message-ID: <20090206151659.GK18368@elte.hu> (raw)
In-Reply-To: <alpine.DEB.1.10.0902060956480.10059@gandalf.stny.rr.com>
* Steven Rostedt <rostedt@goodmis.org> wrote:
>
> On Fri, 6 Feb 2009, Ingo Molnar wrote:
> > > Is it OK to rebase the branch to do so?
> >
> > Sure, that's necessary.
>
> OK, will do.
>
> >
> > And note that unless you base your tree against tip:tracing/ftrace i cannot
> > do a straight pull anyway. (your trees are usually based against tip:master
> > - which brings in all other branches)
>
> Which is better for you? Should I base it off of tracing/ftrace instead? I
> just been using master to make sure I did not break anything else in your
> repo ;-)
I'll resolve conflicts, no need to worry about that - so it would be nice if
you could base it on tracing/ftrace (or tracing/core). You can test-merge
your branch against tip/master and see whether there's any conflict.
> I can set up a branch called tip/ftrace/devel that will be based off of
> tracing/ftrace, and keep tip/devel off of tip/master. This will let you
> know which repo my post is based off of. I'll also add it to the subject.
ok, that will work - thanks!
Ingo
next prev parent reply other threads:[~2009-02-06 15:17 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-02-06 6:53 [PATCH 0/4] ftrace: updates for tip Steven Rostedt
2009-02-06 6:53 ` [PATCH 1/4] ftrace, x86: rename in_nmi variable Steven Rostedt
2009-02-06 6:53 ` [PATCH 2/4] nmi: add generic nmi tracking state Steven Rostedt
2009-02-06 7:12 ` Andrew Morton
2009-02-06 13:25 ` Steven Rostedt
2009-02-06 17:10 ` Andrew Morton
2009-02-06 17:22 ` Steven Rostedt
2009-02-06 9:34 ` Peter Zijlstra
2009-02-06 14:46 ` Ingo Molnar
2009-02-06 14:50 ` Steven Rostedt
2009-02-06 14:54 ` Ingo Molnar
2009-02-06 14:59 ` Steven Rostedt
2009-02-06 15:16 ` Ingo Molnar [this message]
2009-02-06 15:33 ` Frederic Weisbecker
2009-02-06 15:43 ` Ingo Molnar
2009-02-06 6:53 ` [PATCH 3/4] ftrace: change function graph tracer to use new in_nmi Steven Rostedt
2009-02-06 6:53 ` [PATCH 4/4] ring-buffer: use generic version of in_nmi Steven Rostedt
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=20090206151659.GK18368@elte.hu \
--to=mingo@elte.hu \
--cc=akpm@linux-foundation.org \
--cc=fweisbec@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mathieu.desnoyers@polymtl.ca \
--cc=peterz@infradead.org \
--cc=rostedt@goodmis.org \
--cc=srostedt@redhat.com \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).