Unverified Commit caf9d82b authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!5669 disable CONFIG_CMDLINE_FROM_BOOTLOADER CONFIG_INITRAMFS_PRESERVE_MTIME in 6.6 

Merge Pull Request from: @ci-robot 
 
PR sync from: Lin Yujun <linyujun809@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/R5QGR4ZUB6ZEYG43WP6ZOHZM5KUDPWCX/ 

Lin Yujun (1):
  configs: disable CONFIG_CMDLINE_FROM_BOOTLOADER
    CONFIG_INITRAMFS_PRESERVE_MTIME in 6.6


-- 
2.34.1
 
https://gitee.com/openeuler/kernel/issues/I9CW2A 
 
Link:https://gitee.com/openeuler/kernel/pulls/5669

 

Reviewed-by: default avatarJackie Liu <liuyun01@kylinos.cn>
Reviewed-by: default avatarGou Hao <gouhao@uniontech.com>
Reviewed-by: default avatarZhang Jianhua <chris.zjh@huawei.com>
Reviewed-by: default avatarLiu Chao <liuchao173@huawei.com>
Signed-off-by: default avatarZheng Zengkai <zhengzengkai@huawei.com>
parents 99b7d010 6e22c3b1

arch/arm64/configs/openeuler_defconfig

+2 −2
Original line number Diff line number Diff line
@@ -220,7 +220,7 @@ CONFIG_INITRAMFS_FILE_METADATA="" 
CONFIG_BOOT_CONFIG=y

# CONFIG_BOOT_CONFIG_FORCE is not set

# CONFIG_BOOT_CONFIG_EMBED is not set

CONFIG_INITRAMFS_PRESERVE_MTIME=y

# CONFIG_INITRAMFS_PRESERVE_MTIME is not set

CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE=y

# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set

CONFIG_LD_ORPHAN_WARN=y
@@ -578,7 +578,7 @@ CONFIG_CLEAR_USER_WORKAROUND=y 
#

CONFIG_ARM64_ACPI_PARKING_PROTOCOL=y

CONFIG_CMDLINE="console=ttyAMA0"

CONFIG_CMDLINE_FROM_BOOTLOADER=y

# CONFIG_CMDLINE_FROM_BOOTLOADER is not set

# CONFIG_CMDLINE_FORCE is not set

CONFIG_EFI_STUB=y

CONFIG_EFI=y

arch/x86/configs/openeuler_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -241,7 +241,7 @@ CONFIG_INITRAMFS_FILE_METADATA="" 
CONFIG_BOOT_CONFIG=y

# CONFIG_BOOT_CONFIG_FORCE is not set

# CONFIG_BOOT_CONFIG_EMBED is not set

CONFIG_INITRAMFS_PRESERVE_MTIME=y

# CONFIG_INITRAMFS_PRESERVE_MTIME is not set

CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE=y

# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set

CONFIG_LD_ORPHAN_WARN=y