mirror of
https://github.com/kata-containers/kata-containers.git
synced 2025-08-18 16:08:25 +00:00
Merge 2a59505df5
into 9379a18c8a
This commit is contained in:
commit
8c25c785e1
@ -12,7 +12,6 @@ CONFIG_CRYPTO_MANAGER=y
|
|||||||
CONFIG_CRYPTO_MANAGER2=y
|
CONFIG_CRYPTO_MANAGER2=y
|
||||||
CONFIG_CRYPTO_USER=y
|
CONFIG_CRYPTO_USER=y
|
||||||
CONFIG_CRYPTO_NULL=y
|
CONFIG_CRYPTO_NULL=y
|
||||||
CONFIG_CRYPTO_NULL2=y
|
|
||||||
CONFIG_CRYPTO_CRYPTD=y
|
CONFIG_CRYPTO_CRYPTD=y
|
||||||
CONFIG_CRYPTO_AUTHENC=y
|
CONFIG_CRYPTO_AUTHENC=y
|
||||||
CONFIG_CRYPTO_CBC=y
|
CONFIG_CRYPTO_CBC=y
|
||||||
|
@ -9,3 +9,6 @@ CONFIG_PCIEPORTBUS=y
|
|||||||
# Define hotplugs to be online immediately. Speeds things up, and makes things
|
# Define hotplugs to be online immediately. Speeds things up, and makes things
|
||||||
# work smoother on some arch's.
|
# work smoother on some arch's.
|
||||||
CONFIG_MEMORY_HOTPLUG_DEFAULT_ONLINE=y
|
CONFIG_MEMORY_HOTPLUG_DEFAULT_ONLINE=y
|
||||||
|
|
||||||
|
# Linux v6.14+ dropped MEMORY_HOTPLUG_DEFAULT_ONLINE. The equivalent is:
|
||||||
|
CONFIG_MHP_DEFAULT_ONLINE_TYPE_ONLINE_AUTO=y
|
||||||
|
@ -39,3 +39,5 @@ CONFIG_MITIGATION_PAGE_TABLE_ISOLATION
|
|||||||
CONFIG_VFIO_AP
|
CONFIG_VFIO_AP
|
||||||
CONFIG_VFIO_MDEV
|
CONFIG_VFIO_MDEV
|
||||||
CONFIG_BLK_DEV_WRITE_MOUNTED
|
CONFIG_BLK_DEV_WRITE_MOUNTED
|
||||||
|
CONFIG_MEMORY_HOTPLUG_DEFAULT_ONLINE
|
||||||
|
CONFIG_MHP_DEFAULT_ONLINE_TYPE_ONLINE_AUTO
|
||||||
|
@ -0,0 +1,7 @@
|
|||||||
|
# To keep CRYPTO_FIPS enabled, the following dependencies
|
||||||
|
# are needed. This is done for confidential guest build
|
||||||
|
# target only since it's needed by v6.16+ kernels. Move
|
||||||
|
# to a common fragment once non-confidential guest kernels
|
||||||
|
# follow.
|
||||||
|
CONFIG_CRYPTO_SELFTESTS=y
|
||||||
|
CONFIG_EXPERT=y
|
@ -1,3 +1,2 @@
|
|||||||
# x86 cryptographic instructions to improve AES encryption and SHA256 hashing.
|
# x86 cryptographic instructions to improve AES encryption and SHA256 hashing.
|
||||||
CONFIG_CRYPTO_SHA256_SSSE3=y
|
|
||||||
CONFIG_CRYPTO_AES_NI_INTEL=y
|
CONFIG_CRYPTO_AES_NI_INTEL=y
|
||||||
|
@ -7,6 +7,5 @@ CONFIG_INTEL_TDX_GUEST=y
|
|||||||
CONFIG_OF=y
|
CONFIG_OF=y
|
||||||
CONFIG_TDX_GUEST_DRIVER=y
|
CONFIG_TDX_GUEST_DRIVER=y
|
||||||
CONFIG_VIRT_DRIVERS=y
|
CONFIG_VIRT_DRIVERS=y
|
||||||
CONFIG_X86_5LEVEL=y
|
|
||||||
CONFIG_X86_INTEL_MEMORY_PROTECTION_KEYS=y
|
CONFIG_X86_INTEL_MEMORY_PROTECTION_KEYS=y
|
||||||
CONFIG_X86_PLATFORM_DEVICES=y
|
CONFIG_X86_PLATFORM_DEVICES=y
|
||||||
|
@ -1 +1 @@
|
|||||||
160
|
161
|
||||||
|
@ -200,7 +200,7 @@ assets:
|
|||||||
confidential:
|
confidential:
|
||||||
description: "Linux kernel with x86_64 TEEs (SNP and TDX) support"
|
description: "Linux kernel with x86_64 TEEs (SNP and TDX) support"
|
||||||
url: "https://cdn.kernel.org/pub/linux/kernel/v6.x/"
|
url: "https://cdn.kernel.org/pub/linux/kernel/v6.x/"
|
||||||
version: "v6.12.36"
|
version: "v6.16"
|
||||||
|
|
||||||
kernel-arm-experimental:
|
kernel-arm-experimental:
|
||||||
description: "Linux kernel with cpu/mem hotplug support on arm64"
|
description: "Linux kernel with cpu/mem hotplug support on arm64"
|
||||||
|
Loading…
Reference in New Issue
Block a user