From a792dc3e2b0767b7cd822ae6293c2c76942175d6 Mon Sep 17 00:00:00 2001 From: Hyounggyu Choi Date: Mon, 15 Apr 2024 10:28:59 +0200 Subject: [PATCH] kernel: Adjust s390x config for confidential containers `CONFIG_TN3270_TTY` and `CONFIG_S390_AP_IOMMU` are dropped for s390x in 6.7.x which is used for a confidential kernel. But they are still used for a vanilla kernel. So we need to add them to the whitelist. Fixes: #9465 Signed-off-by: Hyounggyu Choi --- tools/packaging/kernel/configs/fragments/whitelist.conf | 2 ++ tools/packaging/kernel/kata_config_version | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/tools/packaging/kernel/configs/fragments/whitelist.conf b/tools/packaging/kernel/configs/fragments/whitelist.conf index 8df4187a7f..171e51d454 100644 --- a/tools/packaging/kernel/configs/fragments/whitelist.conf +++ b/tools/packaging/kernel/configs/fragments/whitelist.conf @@ -27,3 +27,5 @@ CONFIG_SPECULATION_MITIGATIONS CONFIG_X86_SGX CONFIG_VIRTIO_IOMMU CONFIG_CRYPTO_ECDSA +CONFIG_TN3270_TTY +CONFIG_S390_AP_IOMMU diff --git a/tools/packaging/kernel/kata_config_version b/tools/packaging/kernel/kata_config_version index c75acbe2ff..a949a93dfc 100644 --- a/tools/packaging/kernel/kata_config_version +++ b/tools/packaging/kernel/kata_config_version @@ -1 +1 @@ -127 +128