Messages in this thread | | | Date | Fri, 6 Feb 2009 09:59:26 -0500 (EST) | From | Steven Rostedt <> | Subject | Re: [PATCH 2/4] nmi: add generic nmi tracking state |
| |
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 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.
-- Steve
| |