From: "Paul E. McKenney" <paulmck@linux.vnet.ibm.com>
To: Steven Rostedt <rostedt@goodmis.org>
Cc: linux-kernel@vger.kernel.org, Ingo Molnar <mingo@kernel.org>,
Andrew Morton <akpm@linux-foundation.org>,
Frederic Weisbecker <fweisbec@gmail.com>
Subject: Re: [PATCH 0/4 v2] [GIT PULL][RCU][3.12] tracing/rcu: Export strings to userspace
Date: Fri, 2 Aug 2013 09:32:02 -0700 [thread overview]
Message-ID: <20130802163202.GG3836@linux.vnet.ibm.com> (raw)
In-Reply-To: <1375460559.22073.4.camel@gandalf.local.home>
On Fri, Aug 02, 2013 at 12:22:39PM -0400, Steven Rostedt wrote:
> On Fri, 2013-08-02 at 08:51 -0700, Paul E. McKenney wrote:
>
> > I have merged these into v3.11-rc3 in my local tree like this:
> >
> > # git log --pretty=oneline v3.11-rc3..
> > a6f8eb9e4c18ba0e9a2ed4d2dec888440da12549 Merge branch 'ftrace/rcu-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace into rostedt.2013.08.02a
> > f7f7bac9cb1c50783f15937a11743655a5756a36 rcu: Have the RCU tracepoints use the tracepoint_string infrastructure
> > a41bfeb2f8ed59410be7ca0f8fbc6138a758b746 rcu: Simplify RCU_STATE_INITIALIZER() macro
> > e66c33d579ea566d10e8c8695a7168aae3e02992 rcu: Add const annotation to char * for RCU tracepoints and functions
> > 102c9323c35a83789ad5ebd3c45fa8fb389add88 tracing: Add __tracepoint_string() to export string pointers
> >
> > Amazingly enough, there is only one trivial conflict with the current
> > 3.12 RCU commits, so my plan is to treat these commits as a separate
> > topic branch for RCU.
>
> Sounds good. Thanks!
Ah -- unlike my normal approach, I will -not- be rebasing this particular
topic branch, so we should be able to both send them upstream without
any problems.
Famous last words. ;-)
Thanx, Paul
prev parent reply other threads:[~2013-08-02 16:32 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-08-02 2:39 [PATCH 0/4 v2] [GIT PULL][RCU][3.12] tracing/rcu: Export strings to userspace Steven Rostedt
2013-08-02 2:39 ` [PATCH 1/4 v2] tracing: Add __tracepoint_string() to export string pointers Steven Rostedt
2013-08-02 2:39 ` [PATCH 2/4 v2] rcu: Add const annotation to char * for RCU tracepoints and functions Steven Rostedt
2013-08-02 2:39 ` [PATCH 3/4 v2] rcu: Simplify RCU_STATE_INITIALIZER() macro Steven Rostedt
2013-08-02 2:39 ` [PATCH 4/4 v2] rcu: Have the RCU tracepoints use the tracepoint_string infrastructure Steven Rostedt
2014-04-30 22:29 ` Sasha Levin
2014-05-01 0:41 ` Steven Rostedt
2013-08-02 15:51 ` [PATCH 0/4 v2] [GIT PULL][RCU][3.12] tracing/rcu: Export strings to userspace Paul E. McKenney
2013-08-02 16:22 ` Steven Rostedt
2013-08-02 16:32 ` 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=20130802163202.GG3836@linux.vnet.ibm.com \
--to=paulmck@linux.vnet.ibm.com \
--cc=akpm@linux-foundation.org \
--cc=fweisbec@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=rostedt@goodmis.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.