diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-07-31 10:26:59 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-07-31 10:26:59 -0700 |
commit | d2eee9fca172d0d010ef3060cdc971e0b079b87f (patch) | |
tree | 969341bedc2214441833bf10202de6842e676c25 /fs/splice.c | |
parent | 52fde4348ccc317e7ad091a3280f5d4ae19f91ef (diff) | |
parent | 6c77221df96177da0520847ce91e33f539fb8b2d (diff) | |
download | linux-d2eee9fca172d0d010ef3060cdc971e0b079b87f.tar.bz2 |
Merge tag 'trace-v5.3-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace
Pull tracing fixes from Steven Rostedt:
"Two minor fixes:
- Fix trace event header include guards, as several did not match the
#define to the #ifdef
- Remove a redundant test to ftrace_graph_notrace_addr() that was
accidentally added"
* tag 'trace-v5.3-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace:
fgraph: Remove redundant ftrace_graph_notrace_addr() test
tracing: Fix header include guards in trace event headers
Diffstat (limited to 'fs/splice.c')
0 files changed, 0 insertions, 0 deletions