From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 5 Jan 2019 22:08:00 +0000 (-0800)
Subject: Merge tag 'trace-v4.21-1' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt... 
X-Git-Tag: v5.0-rc1~22
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=a67012412e5a820c44239af9712a1a6037b33fd4;p=linux-2.6-block.git

Merge tag 'trace-v4.21-1' of git://git./linux/kernel/git/rostedt/linux-trace

Pull ftrace sh build fix from Steven Rostedt:
 "It appears that the zero-day bot did find a bug in my sh build.

  And that I didn't have the bad code in my config file when I cross
  compiled it, although there are a few other errors in sh that makes it
  not build for me, I missed that I added one more"

* tag 'trace-v4.21-1' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace:
  sh: ftrace: Fix missing parenthesis in WARN_ON()
---

a67012412e5a820c44239af9712a1a6037b33fd4