From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 25 May 2019 17:08:14 +0000 (-0700)
Subject: Merge tag 'trace-v5.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt... 
X-Git-Tag: v5.4-rc1~899
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a2c48d98fc0770f7993cf61c71659a99e1d2857e;p=platform%2Fkernel%2Flinux-rpi.git

Merge tag 'trace-v5.2-rc1' of git://git./linux/kernel/git/rostedt/linux-trace

Pull tracing fixes from Steven Rostedt:
 "Tom Zanussi sent me some small fixes and cleanups to the histogram
  code and I forgot to incorporate them.

  I also added a small clean up patch that was sent to me a while ago
  and I just noticed it"

* tag 'trace-v5.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace:
  kernel/trace/trace.h: Remove duplicate header of trace_seq.h
  tracing: Add a check_val() check before updating cond_snapshot() track_val
  tracing: Check keys for variable references in expressions too
  tracing: Prevent hist_field_var_ref() from accessing NULL tracing_map_elts
---

a2c48d98fc0770f7993cf61c71659a99e1d2857e