public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Ingo Molnar <mingo@kernel.org>
To: Steven Rostedt <rostedt@goodmis.org>
Cc: LKML <linux-kernel@vger.kernel.org>,
	Andrew Morton <akpm@linux-foundation.org>,
	Linus Torvalds <torvalds@linux-foundation.org>,
	"Paul E. McKenney" <paulmck@us.ibm.com>,
	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: Thu, 13 Sep 2012 17:20:28 +0200	[thread overview]
Message-ID: <20120913152028.GB27521@gmail.com> (raw)
In-Reply-To: <1347475616.10751.74.camel@gandalf.local.home>


* 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.

Thanks,

	Ingo

  reply	other threads:[~2012-09-13 15:20 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 [this message]
2012-09-19 15:34   ` Paul E. McKenney

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=20120913152028.GB27521@gmail.com \
    --to=mingo@kernel.org \
    --cc=akpm@linux-foundation.org \
    --cc=josh@joshtriplett.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mathieu.desnoyers@efficios.com \
    --cc=paulmck@us.ibm.com \
    --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