Merge tag 'trace-v5.0-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 7 Feb 2019 07:59:01 +0000 (07:59 +0000)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 7 Feb 2019 07:59:01 +0000 (07:59 +0000)
commit4879f11615d29d7b91cd5a4cfbff8e563ada991d
tree5eedc6421bb041bb24309f522b369a9139f5fb6d
parent076a3f553743cca32ff261d4bea29a4e92d936dd
parent0722069a5374b904ec1a67f91249f90e1cfae259
Merge tag 'trace-v5.0-rc3' of git://git./linux/kernel/git/rostedt/linux-trace

Pull tracing fixes from Steven Rostedt:
 "This has two fixes for uprobe code.

   - Cut and paste fix to have uprobe printks say "uprobe" and not
     "kprobe"

   - Add terminating '\0' byte when copying function arguments"

* tag 'trace-v5.0-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace:
  tracing/uprobes: Fix output for multiple string arguments
  tracing: uprobes: Fix typo in pr_fmt string