Merge tag 'bootconfig-v6.3' of git://git.kernel.org/pub/scm/linux/kernel/git/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

diff --combined init/Kconfig
index 77a4318,53bb993..8a27575
--- 1/init/Kconfig
--- 2/init/Kconfig
+++ b/init/Kconfig
@@@ -1045,10 -1045,6 +1045,10 @@@ config RT_GROUP_SCHE
  
  endif #CGROUP_SCHED
  
 +config SCHED_MM_CID
 +      def_bool y
 +      depends on SMP && RSEQ
 +
  config UCLAMP_TASK_GROUP
        bool "Utilization clamping per group of tasks"
        depends on CGROUP_SCHED
@@@ -1384,6 -1380,19 +1384,19 @@@ config BOOT_CONFI
  
          If unsure, say Y.
  
+ config BOOT_CONFIG_FORCE
+       bool "Force unconditional bootconfig processing"
+       depends on BOOT_CONFIG
+       default y if BOOT_CONFIG_EMBED
+       help
+         With this Kconfig option set, BOOT_CONFIG processing is carried
+         out even when the "bootconfig" kernel-boot parameter is omitted.
+         In fact, with this Kconfig option set, there is no way to
+         make the kernel ignore the BOOT_CONFIG-supplied kernel-boot
+         parameters.
+ 
+         If unsure, say N.
+ 
  config BOOT_CONFIG_EMBED
        bool "Embed bootconfig file in the kernel"
        depends on BOOT_CONFIG
@@@ -1873,6 -1882,7 +1886,6 @@@ config PERF_EVENT
        default y if PROFILING
        depends on HAVE_PERF_EVENTS
        select IRQ_WORK
 -      select SRCU
        help
          Enable kernel support for various performance events provided
          by software and hardware.
@@@ -1942,7 -1952,7 +1955,7 @@@ config RUS
        depends on !MODVERSIONS
        depends on !GCC_PLUGINS
        depends on !RANDSTRUCT
 -      depends on !DEBUG_INFO_BTF
 +      depends on !DEBUG_INFO_BTF || PAHOLE_HAS_LANG_EXCLUDE
        select CONSTRUCTORS
        help
          Enables Rust support in the kernel.