From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 23 Sep 2020 21:52:22 +0000 (-0700)
Subject: Merge tag 'trace-v5.9-rc5-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt... 
X-Git-Tag: v5.15~2864
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c9c9e6a49f8998e9334507378c08cc16cb3ec0e5;p=platform%2Fkernel%2Flinux-starfive.git

Merge tag 'trace-v5.9-rc5-2' of git://git./linux/kernel/git/rostedt/linux-trace

Pull bootconfig fixes from Steven Rostedt:
 "A couple of fixes for bootconfig.

  Masami discovered two bugs which this fixes and he added tests to
  cover these issues.

   - Fix a bug that breaks bootconfig tree nodes

   - Fix a bug that does not truncate whitespace properly

   - Add tests to cover the above two cases"

* tag 'trace-v5.9-rc5-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace:
  tools/bootconfig: Add testcase for tailing space
  tools/bootconfig: Add testcases for repeated key with brace
  lib/bootconfig: Fix to remove tailing spaces after value
  lib/bootconfig: Fix a bug of breaking existing tree nodes
---

c9c9e6a49f8998e9334507378c08cc16cb3ec0e5