From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 15 Sep 2018 03:31:02 +0000 (-1000)
Subject: Merge tag 'trace-v4.19-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt... 
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=5b945fd2c34c6324752fc793266b4598a307d765;p=linux.git

Merge tag 'trace-v4.19-rc3' of git://git./linux/kernel/git/rostedt/linux-trace

Pull tracing fix from Steven Rostedt:
 "This fixes an issue with the build system caused by a change that
  modifies CC_FLAGS_FTRACE. The issue is that it breaks the dependencies
  and causes "make targz-pkg" to rebuild the entire world"

* tag 'trace-v4.19-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace:
  tracing/Makefile: Fix handling redefinition of CC_FLAGS_FTRACE
---

5b945fd2c34c6324752fc793266b4598a307d765