diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-06-26 01:16:49 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-06-26 01:16:49 +0200 |
commit | 42e9c85f5c7296c4ec02644a2b3debc7120e2bf4 (patch) | |
tree | 91fc9891196a31635f7b4bcd67457c938dc63389 /drivers/net/ethernet/3com | |
parent | Merge tag 'fsnotify_for_v5.8-rc3' of git://git.kernel.org/pub/scm/linux/kerne... (diff) | |
parent | tracing/boottime: Fix kprobe multiple events (diff) | |
download | linux-42e9c85f5c7296c4ec02644a2b3debc7120e2bf4.tar.xz linux-42e9c85f5c7296c4ec02644a2b3debc7120e2bf4.zip |
Merge tag 'trace-v5.8-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace
Pull tracing fixes from Steven Rostedt:
"Four small fixes:
- Fix a ringbuffer bug for nested events having time go backwards
- Fix a config dependency for boot time tracing to depend on
synthetic events instead of histograms.
- Fix trigger format parsing to handle multiple spaces
- Fix bootconfig to handle failures in multiple events"
* tag 'trace-v5.8-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace:
tracing/boottime: Fix kprobe multiple events
tracing: Fix event trigger to accept redundant spaces
tracing/boot: Fix config dependency for synthedic event
ring-buffer: Zero out time extend if it is nested and not absolute
Diffstat (limited to 'drivers/net/ethernet/3com')
0 files changed, 0 insertions, 0 deletions