diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-01-10 18:03:16 +0100 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-01-10 18:03:16 +0100 |
commit | 4ffd4ebf9d19c07285ea8a26d30a17ff28767132 (patch) | |
tree | d563023f1764aac5c5232315c356fa258f53dcce /arch/xtensa/include/asm/syscall.h | |
parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s39... (diff) | |
parent | tracing: Fix regression of trace_options file setting (diff) | |
download | linux-4ffd4ebf9d19c07285ea8a26d30a17ff28767132.tar.xz linux-4ffd4ebf9d19c07285ea8a26d30a17ff28767132.zip |
Merge tag 'trace-3.8-rc2-regression-fix' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace
Pull tracing regression fix from Steven Rostedt:
"A change that came in this merge window broke the writing to the
trace_options file. It causes garbage to be read during the compare
of option names, and breaks setting options via the trace_options
file, although options can still be set via the options/<option>
files."
* tag 'trace-3.8-rc2-regression-fix' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace:
tracing: Fix regression of trace_options file setting
Diffstat (limited to 'arch/xtensa/include/asm/syscall.h')
0 files changed, 0 insertions, 0 deletions