From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 7 Feb 2019 07:59:01 +0000 (+0000)
Subject: Merge tag 'trace-v5.0-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt... 
X-Git-Tag: v5.0-rc6~34
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=4879f11615d29d7b91cd5a4cfbff8e563ada991d;p=uclinux-h8%2Flinux.git

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
---

4879f11615d29d7b91cd5a4cfbff8e563ada991d