From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 29 Jan 2020 02:26:09 +0000 (-0800)
Subject: Merge tag 'trace-v5.5-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt... 
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=a78416d97425551b6790dc56626ac5c87415f3fc;p=linux.git

Merge tag 'trace-v5.5-rc7' of git://git./linux/kernel/git/rostedt/linux-trace

Pull tracing fix from Steven Rostedt:
 "Kprobe events added 'ustring' to distinguish reading strings from
  kernel space or user space.

  But the creating of the event format file only checks for 'string' to
  display string formats. 'ustring' must also be handled"

* tag 'trace-v5.5-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace:
  tracing/kprobes: Have uname use __get_str() in print_fmt
---

a78416d97425551b6790dc56626ac5c87415f3fc