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! -- Steve -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
