From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 31 Jul 2019 17:26:59 +0000 (-0700)
Subject: Merge tag 'trace-v5.3-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt... 
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=d2eee9fca172d0d010ef3060cdc971e0b079b87f;p=linux.git

Merge tag 'trace-v5.3-rc2' of git://git./linux/kernel/git/rostedt/linux-trace

Pull tracing fixes from Steven Rostedt:
 "Two minor fixes:

   - Fix trace event header include guards, as several did not match the
     #define to the #ifdef

   - Remove a redundant test to ftrace_graph_notrace_addr() that was
     accidentally added"

* tag 'trace-v5.3-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace:
  fgraph: Remove redundant ftrace_graph_notrace_addr() test
  tracing: Fix header include guards in trace event headers
---

d2eee9fca172d0d010ef3060cdc971e0b079b87f