]> git.baikalelectronics.ru Git - kernel.git/commit
Merge tag 'trace-v4.2-rc2-fix2' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 21 Jul 2015 21:42:40 +0000 (14:42 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 21 Jul 2015 21:42:40 +0000 (14:42 -0700)
commit36ff14564eb93b456112801885cd3cf8eaf5b964
tree0e0a9f9b48bd073f80a3b6a86b8402354d2ea39a
parent6a4841a7ea38101551cbd6ff13c6921365fdc3d3
parent6951cd0d821d4d5b4aaa9b5ee545d78482437dc2
Merge tag 'trace-v4.2-rc2-fix2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace

Pull tracing sample code fix from Steven Rostedt:
 "He Kuang noticed that the sample code using the trace_event helper
  function __get_dynamic_array_len() is broken.

  This only changes the sample code, and I'm pushing this now instead of
  later because I don't want others using the broken code as an example
  when using it for real"

* tag 'trace-v4.2-rc2-fix2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace:
  tracing: Fix sample output of dynamic arrays