This is the next queue for 3.15. This includes Namhyung's updates to
uprobes for event triggering, allowing function tracing to be done
by trace instances, and also some other updates.

This is based on 3.14-rc3.

  git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace.git
for-next

Head SHA1: 1fcc155351f183e5044180eeb372a8ff47710855


Namhyung Kim (4):
      tracing/uprobes: Rename uprobe_{trace,perf}_print() functions
      tracing/uprobes: Move argument fetching to uprobe_dispatcher()
      tracing/uprobes: Support event triggering
      tracing/uprobes: Support mix of ftrace and perf

Steven Rostedt (1):
      tracing: Add trace_clock=<clock> kernel parameter

Steven Rostedt (Red Hat) (12):
      tracing: Pass trace_array to set_flag callback
      tracing: Pass trace_array to flag_changed callback
      tracing: Set up infrastructure to allow tracers for instances
      tracing: Only let top level have option files
      ftrace: Add private data to ftrace_ops
      ftrace: Copy ops private to global_ops private
      tracing: Disable tracers before deletion of instance
      tracing: Convert tracer->enabled to counter
      ftrace: Allow instances to use function tracing
      ftrace: Pass in global_ops for use with filtering files
      ftrace: Allow for function tracing instance to filter functions
      ftrace: Have static function trace clear ENABLED flag on unregister

zhangwei(Jovi) (1):
      tracing/uprobes: Support ftrace_event_file base multibuffer

----
 include/linux/ftrace.h               |  14 +++
 kernel/trace/blktrace.c              |   3 +-
 kernel/trace/ftrace.c                |  72 +++++++++----
 kernel/trace/trace.c                 | 187 +++++++++++++++++++++++++---------
 kernel/trace/trace.h                 |  38 ++++++-
 kernel/trace/trace_functions.c       | 143 ++++++++++++++++++--------
 kernel/trace/trace_functions_graph.c |   3 +-
 kernel/trace/trace_irqsoff.c         |  10 +-
 kernel/trace/trace_kprobe.c          |  17 ----
 kernel/trace/trace_nop.c             |   5 +-
 kernel/trace/trace_probe.h           |  17 ++++
 kernel/trace/trace_sched_wakeup.c    |  10 +-
 kernel/trace/trace_uprobe.c          | 191 ++++++++++++++++++++++++-----------
 13 files changed, 519 insertions(+), 191 deletions(-)
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Reply via email to