Skip to content

[CIQ] v6.12.17 config updates #196

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 4, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions ciq/configs/kernel-aarch64-64k-debug.config
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
# Linux/arm64 6.12.15 Kernel Configuration
# Linux/arm64 6.12.17 Kernel Configuration
#
CONFIG_CC_VERSION_TEXT="gcc (scripts/dummy-tools/gcc)"
CONFIG_CC_IS_GCC=y
Expand Down Expand Up @@ -6861,7 +6861,6 @@ CONFIG_CHROME_PLATFORMS=y
# CONFIG_CROS_KBD_LED_BACKLIGHT is not set
CONFIG_CROS_HPS_I2C=m
# CONFIG_CHROMEOS_PRIVACY_SCREEN is not set
# CONFIG_CZNIC_PLATFORMS is not set
CONFIG_MELLANOX_PLATFORM=y
CONFIG_MLXREG_HOTPLUG=m
CONFIG_MLXREG_IO=m
Expand Down
3 changes: 1 addition & 2 deletions ciq/configs/kernel-aarch64-64k.config
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
# Linux/arm64 6.12.15 Kernel Configuration
# Linux/arm64 6.12.17 Kernel Configuration
#
CONFIG_CC_VERSION_TEXT="gcc (scripts/dummy-tools/gcc)"
CONFIG_CC_IS_GCC=y
Expand Down Expand Up @@ -6840,7 +6840,6 @@ CONFIG_CHROME_PLATFORMS=y
# CONFIG_CROS_KBD_LED_BACKLIGHT is not set
CONFIG_CROS_HPS_I2C=m
# CONFIG_CHROMEOS_PRIVACY_SCREEN is not set
# CONFIG_CZNIC_PLATFORMS is not set
CONFIG_MELLANOX_PLATFORM=y
CONFIG_MLXREG_HOTPLUG=m
CONFIG_MLXREG_IO=m
Expand Down
6 changes: 2 additions & 4 deletions ciq/configs/kernel-aarch64-debug.config
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
# arm64
#
# Automatically generated file; DO NOT EDIT.
# Linux/arm64 6.12.15 Kernel Configuration
# Linux/arm64 6.12.17 Kernel Configuration
#
CONFIG_CC_VERSION_TEXT="gcc (scripts/dummy-tools/gcc)"
CONFIG_CC_IS_GCC=y
Expand Down Expand Up @@ -6867,7 +6866,6 @@ CONFIG_CHROME_PLATFORMS=y
# CONFIG_CROS_KBD_LED_BACKLIGHT is not set
CONFIG_CROS_HPS_I2C=m
# CONFIG_CHROMEOS_PRIVACY_SCREEN is not set
# CONFIG_CZNIC_PLATFORMS is not set
CONFIG_MELLANOX_PLATFORM=y
CONFIG_MLXREG_HOTPLUG=m
CONFIG_MLXREG_IO=m
Expand Down Expand Up @@ -7836,10 +7834,10 @@ CONFIG_SECURITY_YAMA=y
# CONFIG_SECURITY_SAFESETID is not set
CONFIG_SECURITY_LOCKDOWN_LSM=y
CONFIG_SECURITY_LOCKDOWN_LSM_EARLY=y
CONFIG_LOCK_DOWN_IN_EFI_SECURE_BOOT=y
CONFIG_LOCK_DOWN_KERNEL_FORCE_NONE=y
# CONFIG_LOCK_DOWN_KERNEL_FORCE_INTEGRITY is not set
# CONFIG_LOCK_DOWN_KERNEL_FORCE_CONFIDENTIALITY is not set
CONFIG_LOCK_DOWN_IN_EFI_SECURE_BOOT=y
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like this is enabled in the normal kernels so it should be ok, but calling out that it changed too.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It actually just moved.
make olddefconig will I've some things around sometimes or remove .
This specific section was in the 6.12.16 configs fixup but apparently missed.

CONFIG_SECURITY_LANDLOCK=y
# CONFIG_SECURITY_IPE is not set
CONFIG_INTEGRITY=y
Expand Down
3 changes: 1 addition & 2 deletions ciq/configs/kernel-aarch64.config
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
# Linux/arm64 6.12.15 Kernel Configuration
# Linux/arm64 6.12.17 Kernel Configuration
#
CONFIG_CC_VERSION_TEXT="gcc (scripts/dummy-tools/gcc)"
CONFIG_CC_IS_GCC=y
Expand Down Expand Up @@ -6845,7 +6845,6 @@ CONFIG_CHROME_PLATFORMS=y
# CONFIG_CROS_KBD_LED_BACKLIGHT is not set
CONFIG_CROS_HPS_I2C=m
# CONFIG_CHROMEOS_PRIVACY_SCREEN is not set
# CONFIG_CZNIC_PLATFORMS is not set
CONFIG_MELLANOX_PLATFORM=y
CONFIG_MLXREG_HOTPLUG=m
CONFIG_MLXREG_IO=m
Expand Down
4 changes: 1 addition & 3 deletions ciq/configs/kernel-x86_64-debug.config
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
# Linux/x86_64 6.12.15 Kernel Configuration
# Linux/x86_64 6.12.17 Kernel Configuration
#
CONFIG_CC_VERSION_TEXT="gcc (scripts/dummy-tools/gcc)"
CONFIG_CC_IS_GCC=y
Expand Down Expand Up @@ -2274,7 +2274,6 @@ CONFIG_UNACCEPTED_MEMORY=y

CONFIG_UEFI_CPER=y
CONFIG_UEFI_CPER_X86=y
CONFIG_IMX_SCMI_MISC_DRV=y

#
# Qualcomm firmware drivers
Expand Down Expand Up @@ -7186,7 +7185,6 @@ CONFIG_XEN_FRONT_PGDIR_SHBUF=m
# CONFIG_STAGING is not set
# CONFIG_GOLDFISH is not set
# CONFIG_CHROME_PLATFORMS is not set
# CONFIG_CZNIC_PLATFORMS is not set
CONFIG_MELLANOX_PLATFORM=y
CONFIG_MLXREG_HOTPLUG=m
CONFIG_MLXREG_IO=m
Expand Down
4 changes: 1 addition & 3 deletions ciq/configs/kernel-x86_64.config
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
# Linux/x86_64 6.12.15 Kernel Configuration
# Linux/x86_64 6.12.17 Kernel Configuration
#
CONFIG_CC_VERSION_TEXT="gcc (scripts/dummy-tools/gcc)"
CONFIG_CC_IS_GCC=y
Expand Down Expand Up @@ -2270,7 +2270,6 @@ CONFIG_UNACCEPTED_MEMORY=y

CONFIG_UEFI_CPER=y
CONFIG_UEFI_CPER_X86=y
CONFIG_IMX_SCMI_MISC_DRV=y

#
# Qualcomm firmware drivers
Expand Down Expand Up @@ -7164,7 +7163,6 @@ CONFIG_XEN_FRONT_PGDIR_SHBUF=m
# CONFIG_STAGING is not set
# CONFIG_GOLDFISH is not set
# CONFIG_CHROME_PLATFORMS is not set
# CONFIG_CZNIC_PLATFORMS is not set
CONFIG_MELLANOX_PLATFORM=y
CONFIG_MLXREG_HOTPLUG=m
CONFIG_MLXREG_IO=m
Expand Down