)]}'
{
  "commit": "e382608254e06c8109f40044f5e693f2e04f3899",
  "tree": "7c46c58a5a15d19a312c35a8e70e69d1cbd93236",
  "parents": [
    "fcbc1777ce8b5edf831c1eca16c1a63c1e4f39fb",
    "b44754d8262d3aab842998cf747f44fe6090be9f"
  ],
  "author": {
    "name": "Linus Torvalds",
    "email": "torvalds@linux-foundation.org",
    "time": "Fri Jun 26 14:02:43 2015 -0700"
  },
  "committer": {
    "name": "Linus Torvalds",
    "email": "torvalds@linux-foundation.org",
    "time": "Fri Jun 26 14:02:43 2015 -0700"
  },
  "message": "Merge tag \u0027trace-v4.2\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace\n\nPull tracing updates from Steven Rostedt:\n \"This patch series contains several clean ups and even a new trace\n  clock \"monitonic raw\".  Also some enhancements to make the ring buffer\n  even faster.  But the biggest and most noticeable change is the\n  renaming of the ftrace* files, structures and variables that have to\n  deal with trace events.\n\n  Over the years I\u0027ve had several developers tell me about their\n  confusion with what ftrace is compared to events.  Technically,\n  \"ftrace\" is the infrastructure to do the function hooks, which include\n  tracing and also helps with live kernel patching.  But the trace\n  events are a separate entity altogether, and the files that affect the\n  trace events should not be named \"ftrace\".  These include:\n\n    include/trace/ftrace.h         -\u003e    include/trace/trace_events.h\n    include/linux/ftrace_event.h   -\u003e    include/linux/trace_events.h\n\n  Also, functions that are specific for trace events have also been renamed:\n\n    ftrace_print_*()               -\u003e    trace_print_*()\n    (un)register_ftrace_event()    -\u003e    (un)register_trace_event()\n    ftrace_event_name()            -\u003e    trace_event_name()\n    ftrace_trigger_soft_disabled() -\u003e    trace_trigger_soft_disabled()\n    ftrace_define_fields_##call()  -\u003e    trace_define_fields_##call()\n    ftrace_get_offsets_##call()    -\u003e    trace_get_offsets_##call()\n\n  Structures have been renamed:\n\n    ftrace_event_file              -\u003e    trace_event_file\n    ftrace_event_{call,class}      -\u003e    trace_event_{call,class}\n    ftrace_event_buffer            -\u003e    trace_event_buffer\n    ftrace_subsystem_dir           -\u003e    trace_subsystem_dir\n    ftrace_event_raw_##call        -\u003e    trace_event_raw_##call\n    ftrace_event_data_offset_##call-\u003e    trace_event_data_offset_##call\n    ftrace_event_type_funcs_##call -\u003e    trace_event_type_funcs_##call\n\n  And a few various variables and flags have also been updated.\n\n  This has been sitting in linux-next for some time, and I have not\n  heard a single complaint about this rename breaking anything.  Mostly\n  because these functions, variables and structures are mostly internal\n  to the tracing system and are seldom (if ever) used by anything\n  external to that\"\n\n* tag \u0027trace-v4.2\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace: (33 commits)\n  ring_buffer: Allow to exit the ring buffer benchmark immediately\n  ring-buffer-benchmark: Fix the wrong type\n  ring-buffer-benchmark: Fix the wrong param in module_param\n  ring-buffer: Add enum names for the context levels\n  ring-buffer: Remove useless unused tracing_off_permanent()\n  ring-buffer: Give NMIs a chance to lock the reader_lock\n  ring-buffer: Add trace_recursive checks to ring_buffer_write()\n  ring-buffer: Allways do the trace_recursive checks\n  ring-buffer: Move recursive check to per_cpu descriptor\n  ring-buffer: Add unlikelys to make fast path the default\n  tracing: Rename ftrace_get_offsets_##call() to trace_event_get_offsets_##call()\n  tracing: Rename ftrace_define_fields_##call() to trace_event_define_fields_##call()\n  tracing: Rename ftrace_event_type_funcs_##call to trace_event_type_funcs_##call\n  tracing: Rename ftrace_data_offset_##call to trace_event_data_offset_##call\n  tracing: Rename ftrace_raw_##call event structures to trace_event_raw_##call\n  tracing: Rename ftrace_trigger_soft_disabled() to trace_trigger_soft_disabled()\n  tracing: Rename FTRACE_EVENT_FL_* flags to EVENT_FILE_FL_*\n  tracing: Rename struct ftrace_subsystem_dir to trace_subsystem_dir\n  tracing: Rename ftrace_event_name() to trace_event_name()\n  tracing: Rename FTRACE_MAX_EVENT to TRACE_EVENT_TYPE_MAX\n  ...\n",
  "tree_diff": []
}