public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: "Paul E. McKenney" <paulmck@linux.vnet.ibm.com>
To: Ingo Molnar <mingo@kernel.org>
Cc: Steven Rostedt <rostedt@goodmis.org>,
	LKML <linux-kernel@vger.kernel.org>,
	Andrew Morton <akpm@linux-foundation.org>,
	Linus Torvalds <torvalds@linux-foundation.org>,
	Josh Triplett <josh@joshtriplett.org>,
	Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Subject: Re: [PATCH][GIT PULL][v3.7] trace: Don't declare trace_*_rcuidle functions in modules
Date: Wed, 19 Sep 2012 08:34:47 -0700	[thread overview]
Message-ID: <20120919153446.GA2455@linux.vnet.ibm.com> (raw)
In-Reply-To: <20120913152028.GB27521@gmail.com>

On Thu, Sep 13, 2012 at 05:20:28PM +0200, Ingo Molnar wrote:
> 
> * Steven Rostedt <rostedt@goodmis.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


      reply	other threads:[~2012-09-19 15:39 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-09-12 18:46 [PATCH][GIT PULL][v3.7] trace: Don't declare trace_*_rcuidle functions in modules Steven Rostedt
2012-09-13 15:20 ` Ingo Molnar
2012-09-19 15:34   ` Paul E. McKenney [this message]

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=20120919153446.GA2455@linux.vnet.ibm.com \
    --to=paulmck@linux.vnet.ibm.com \
    --cc=akpm@linux-foundation.org \
    --cc=josh@joshtriplett.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mathieu.desnoyers@efficios.com \
    --cc=mingo@kernel.org \
    --cc=rostedt@goodmis.org \
    --cc=torvalds@linux-foundation.org \
    /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