diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-03-07 13:00:26 +0100 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-03-07 13:00:26 +0100 |
commit | b9facdd0b8e344a224eb690ad84415ec5f04ccd9 (patch) | |
tree | 3ff737aa266c3886baf30d42c30875fc331fb74f /kernel-s390x-debug-rhel.config | |
parent | 0425873da9e24d7dd3520cba75a6cc7d462b6f53 (diff) | |
parent | d964bc4b81a299df5333f83c5137139b0c098cf6 (diff) | |
download | kernel-b9facdd0b8e344a224eb690ad84415ec5f04ccd9.tar.gz kernel-b9facdd0b8e344a224eb690ad84415ec5f04ccd9.tar.xz kernel-b9facdd0b8e344a224eb690ad84415ec5f04ccd9.zip |
merge origin and update to 5.11.4kernel-5.11.4-350.vanilla.1.fc34
Diffstat (limited to 'kernel-s390x-debug-rhel.config')
-rw-r--r-- | kernel-s390x-debug-rhel.config | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/kernel-s390x-debug-rhel.config b/kernel-s390x-debug-rhel.config index 82ac3af17..a91233301 100644 --- a/kernel-s390x-debug-rhel.config +++ b/kernel-s390x-debug-rhel.config @@ -684,7 +684,8 @@ CONFIG_CMA_AREAS=7 # CONFIG_CMA_DEBUGFS is not set # CONFIG_CMA_DEBUG is not set CONFIG_CMA=y -CONFIG_CMDLINE="" +# CONFIG_CMDLINE_EXTEND is not set +CONFIG_CMDLINE_FROM_BOOTLOADER=y # CONFIG_CMDLINE_PARTITION is not set CONFIG_CMM_IUCV=y CONFIG_CMM=m |