Merge tag 'trace-v5.1-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 26 Apr 2019 18:09:55 +0000 (11:09 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 26 Apr 2019 18:09:55 +0000 (11:09 -0700)
commite9e1a2e7b486e3940badb6d743c8841ed94517b6
tree7bccb028f07659cbc060e142ecb8f46f4073b206
parent29279d21997ae4e80dc8b094c5b916cca3e366b8
parentd6097c9e4454adf1f8f2c9547c2fa6060d55d952
Merge tag 'trace-v5.1-rc6' of git://git./linux/kernel/git/rostedt/linux-trace

Pull tracing fixes from Steven Rostedt:
 "Three tracing fixes:

   - Use "nosteal" for ring buffer splice pages

   - Memory leak fix in error path of trace_pid_write()

   - Fix preempt_enable_no_resched() (use preempt_enable()) in ring
     buffer code"

* tag 'trace-v5.1-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace:
  trace: Fix preempt_enable_no_resched() abuse
  tracing: Fix a memory leak by early error exit in trace_pid_write()
  tracing: Fix buffer_ref pipe ops
fs/splice.c
include/linux/pipe_fs_i.h
kernel/trace/trace.c