Merge tag 'trace-v5.11-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 15 Jan 2021 04:06:29 +0000 (20:06 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 15 Jan 2021 04:06:29 +0000 (20:06 -0800)
commitcdaed110311d45cdbefbb9a23a2d1774717b7b71
tree33b36bd86753ab5409a280aba4ff8dab04292d14
parent146620506274bd24d52fb1c589110a30eed8240b
parent55ed4560774d81d7343223b8fd2784c530a9c6c1
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