[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <20120919153446.GA2455@linux.vnet.ibm.com>
Date: Wed, 19 Sep 2012 08:34:47 -0700
From: "Paul E. McKenney" <paulmck@...ux.vnet.ibm.com>
To: Ingo Molnar <mingo@...nel.org>
Cc: Steven Rostedt <rostedt@...dmis.org>,
LKML <linux-kernel@...r.kernel.org>,
Andrew Morton <akpm@...ux-foundation.org>,
Linus Torvalds <torvalds@...ux-foundation.org>,
Josh Triplett <josh@...htriplett.org>,
Mathieu Desnoyers <mathieu.desnoyers@...icios.com>
Subject: Re: [PATCH][GIT PULL][v3.7] trace: Don't declare trace_*_rcuidle
functions in modules
On Thu, Sep 13, 2012 at 05:20:28PM +0200, Ingo Molnar wrote:
>
> * Steven Rostedt <rostedt@...dmis.org> wrote:
>
> > Ingo,
> >
> > Josh made a change to the tracing code that affects both the
> > work Paul McKenney and I are currently doing. At the last
> > Kernel Summit back in August, Linus said when such a case
> > exists, it is best to make a separate branch based off of his
> > tree and place the change there. This way, the repositories
> > that need to share the change can both pull them in and the
> > SHA1 will match for both. Whichever branch is pulled in first
> > by Linus will also pull in the necessary change for the other
> > branch as well.
> >
> > I made a separate branch from Linus's v3.6-rc5 (called
> > tip/perf/rcu) and applied Josh's change to it. Could you
> > please pull this into perf/core and whatever branch that Paul
> > needs it in. Or just have Paul pull this change as well.
>
> Ok, pulled it into tip:core/rcu and then merged core/rcu into
> perf/core.
And I have rebased on top of tip:core/rcu and removed the exports
as part of the mondo rebase to address Peter's review feedback.
Thanx, Paul
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists