From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 23 Feb 2023 22:27:01 +0000 (-0800)
Subject: Merge tag 'bootconfig-v6.3' of git://git.kernel.org/pub/scm/linux/kernel/git/trace... 
X-Git-Tag: v6.6.7~3446
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f2b98d0af217f64b96bc549457018117ba6b7509;p=platform%2Fkernel%2Flinux-starfive.git

Merge tag 'bootconfig-v6.3' of git://git./linux/kernel/git/trace/linux-trace

Pull bootconfig updates from Masami Hiramatsu:

 - Fix ftrace2bconf.sh tool for checking event enable status correctly

 - Add CONFIG_BOOT_CONFIG_FORCE to apply bootconfig without 'bootconfig'
   boot parameter

 - Enable CONFIG_BOOT_CONFIG_FORCE by default if a bootconfig is
   embedded in the kernel

 - Increase max number of nodes of bootconfig to 8192

* tag 'bootconfig-v6.3' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace:
  bootconfig: Increase max nodes of bootconfig from 1024 to 8192 for DCC support
  bootconfig: Default BOOT_CONFIG_FORCE to y if BOOT_CONFIG_EMBED
  Allow forcing unconditional bootconfig processing
  tools/bootconfig: fix single & used for logical condition
---

f2b98d0af217f64b96bc549457018117ba6b7509