diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-01-27 08:22:30 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-01-27 08:22:30 -0800 |
| commit | ba635f8cd20ebc7bddf1eb8e1f4eae28a034e916 (patch) | |
| tree | 2e1f0c73c8fdedc2523dd29fcf32a366427576e5 /net | |
| parent | ba6b5084e6cdd34645dc7430eeef0ebfd09f723f (diff) | |
| parent | 3132e107d608f8753240d82d61303c500fd515b4 (diff) | |
| download | op-kernel-dev-ba635f8cd20ebc7bddf1eb8e1f4eae28a034e916.zip op-kernel-dev-ba635f8cd20ebc7bddf1eb8e1f4eae28a034e916.tar.gz | |
Merge tag 'trace-fixes-3.14' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace
Pull tracing fixes from Steven Rostedt:
"The first two patches fix the debugfs README file to reflect better
the new features added to 3.14.
The third patch is a minor bugfix to the trace_puts() functions that
will crash the system if a developer adds one before the tracing
system is setup. It also affects trace_printk() if it has no
arguments, as the code will convert it to a trace_puts() as well.
Note, this bug will not affect unmodified kernels, as trace_printk()
and trace_puts() should only be used by developers for testing"
* tag 'trace-fixes-3.14' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace:
tracing: Check if tracing is enabled in trace_puts()
tracing: Fix formatting of trace README file
tracing/README: Add event file usage to tracing mini-HOWTO
Diffstat (limited to 'net')
0 files changed, 0 insertions, 0 deletions
