Skip to content

Commit 65d6755

Browse files
[CIQ] v6.12.47 - rebased configs
CONFIG_MITIGATION_VMSCAPE is added and enabled for VMSCAPE attacks. x86/vmscape: Enable the mitigation Upstream commit 556c1ad
1 parent 8623553 commit 65d6755

File tree

6 files changed

+8
-6
lines changed

6 files changed

+8
-6
lines changed

ciq/configs/kernel-aarch64-64k-debug.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#
22
# Automatically generated file; DO NOT EDIT.
3-
# Linux/arm64 6.12.44 Kernel Configuration
3+
# Linux/arm64 6.12.47 Kernel Configuration
44
#
55
CONFIG_CC_VERSION_TEXT="gcc (scripts/dummy-tools/gcc)"
66
CONFIG_CC_IS_GCC=y

ciq/configs/kernel-aarch64-64k.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#
22
# Automatically generated file; DO NOT EDIT.
3-
# Linux/arm64 6.12.44 Kernel Configuration
3+
# Linux/arm64 6.12.47 Kernel Configuration
44
#
55
CONFIG_CC_VERSION_TEXT="gcc (scripts/dummy-tools/gcc)"
66
CONFIG_CC_IS_GCC=y

ciq/configs/kernel-aarch64-debug.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#
22
# Automatically generated file; DO NOT EDIT.
3-
# Linux/arm64 6.12.42 Kernel Configuration
3+
# Linux/arm64 6.12.47 Kernel Configuration
44
#
55
CONFIG_CC_VERSION_TEXT="gcc (scripts/dummy-tools/gcc)"
66
CONFIG_CC_IS_GCC=y

ciq/configs/kernel-aarch64.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#
22
# Automatically generated file; DO NOT EDIT.
3-
# Linux/arm64 6.12.42 Kernel Configuration
3+
# Linux/arm64 6.12.47 Kernel Configuration
44
#
55
CONFIG_CC_VERSION_TEXT="gcc (scripts/dummy-tools/gcc)"
66
CONFIG_CC_IS_GCC=y

ciq/configs/kernel-x86_64-debug.config

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#
22
# Automatically generated file; DO NOT EDIT.
3-
# Linux/x86_64 6.12.42 Kernel Configuration
3+
# Linux/x86_64 6.12.47 Kernel Configuration
44
#
55
CONFIG_CC_VERSION_TEXT="gcc (scripts/dummy-tools/gcc)"
66
CONFIG_CC_IS_GCC=y
@@ -582,6 +582,7 @@ CONFIG_MITIGATION_SRBDS=y
582582
CONFIG_MITIGATION_SSB=y
583583
CONFIG_MITIGATION_ITS=y
584584
CONFIG_MITIGATION_TSA=y
585+
CONFIG_MITIGATION_VMSCAPE=y
585586
CONFIG_ARCH_HAS_ADD_PAGES=y
586587

587588
#

ciq/configs/kernel-x86_64.config

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#
22
# Automatically generated file; DO NOT EDIT.
3-
# Linux/x86_64 6.12.42 Kernel Configuration
3+
# Linux/x86_64 6.12.47 Kernel Configuration
44
#
55
CONFIG_CC_VERSION_TEXT="gcc (scripts/dummy-tools/gcc)"
66
CONFIG_CC_IS_GCC=y
@@ -579,6 +579,7 @@ CONFIG_MITIGATION_SRBDS=y
579579
CONFIG_MITIGATION_SSB=y
580580
CONFIG_MITIGATION_ITS=y
581581
CONFIG_MITIGATION_TSA=y
582+
CONFIG_MITIGATION_VMSCAPE=y
582583
CONFIG_ARCH_HAS_ADD_PAGES=y
583584

584585
#

0 commit comments

Comments
 (0)