tree 33b36bd86753ab5409a280aba4ff8dab04292d14
parent 146620506274bd24d52fb1c589110a30eed8240b
parent 55ed4560774d81d7343223b8fd2784c530a9c6c1
author Linus Torvalds <torvalds@linux-foundation.org> 1610683589 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1610683589 -0800
mergetag object 55ed4560774d81d7343223b8fd2784c530a9c6c1
 type commit
 tag trace-v5.11-rc3
 tagger Steven Rostedt (VMware) <rostedt@goodmis.org> 1610678443 -0500
 
 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.
 -----BEGIN PGP SIGNATURE-----
 
 iIoEABYIADIWIQRRSw7ePDh/lE+zeZMp5XQQmuv6qgUCYAEA4RQccm9zdGVkdEBn
 b29kbWlzLm9yZwAKCRAp5XQQmuv6ql1IAQDRIhEtOER8pCWC/MgRtX9sXgmHPtyr
 OmGCbhlNNRohRQD+KKhtTORIUwqSQqItyuT/YWp7nEh25lLUC3a1LBD4Ugw=
 =YZ7S
 -----END PGP SIGNATURE-----

Merge tag 'trace-v5.11-rc3' of git://git.kernel.org/pub/scm/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