diff options
author | Ingo Molnar <mingo@kernel.org> | 2020-03-06 14:49:56 +0300 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2020-03-06 14:49:56 +0300 |
commit | 1b10d388d094bb32129060236add6f50b204a69d (patch) | |
tree | 08272a4d89833d139e615b07675f95e403cdddbd /init/Kconfig | |
parent | a0f03b617c3b2644d3d47bf7d9e60aed01bd5b10 (diff) | |
parent | 8b614cb8f1dcac8ca77cf4dd85f46ef3055f8238 (diff) | |
download | linux-1b10d388d094bb32129060236add6f50b204a69d.tar.xz |
Merge branch 'linus' into sched/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'init/Kconfig')
-rw-r--r-- | init/Kconfig | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/init/Kconfig b/init/Kconfig index 452bc1835cd4..20a6ac33761c 100644 --- a/init/Kconfig +++ b/init/Kconfig @@ -1226,13 +1226,12 @@ endif config BOOT_CONFIG bool "Boot config support" - depends on BLK_DEV_INITRD - default y + select BLK_DEV_INITRD help Extra boot config allows system admin to pass a config file as complemental extension of kernel cmdline when booting. The boot config file must be attached at the end of initramfs - with checksum and size. + with checksum, size and magic word. See <file:Documentation/admin-guide/bootconfig.rst> for details. If unsure, say Y. |