From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 15 Jan 2021 04:06:29 +0000 (-0800)
Subject: Merge tag 'trace-v5.11-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt... 
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=cdaed110311d45cdbefbb9a23a2d1774717b7b71;p=linux.git

Merge tag 'trace-v5.11-rc3' of git://git./linux/kernel/git/rostedt/linux-trace

Pull bootconfig fix from Steven Rostedt:
 "Update bootconf scripts for tracing_on option

  The tracing_on option is supported by bootconfig entries, but the
  scripts to convert from ftrace to a bootconfig and back were not
  updated"

* tag 'trace-v5.11-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace:
  tools/bootconfig: Add tracing_on support to helper scripts
---

cdaed110311d45cdbefbb9a23a2d1774717b7b71