From 4d1c0a323527849fab67b0bce7af8b06761fc0fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= Date: Thu, 25 Aug 2022 10:51:13 +0200 Subject: [PATCH] kernel: Ignore CONFIG_SPECULATION_MITIGATIONS for older kernels MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit TDX kernel is based on a kernel version which doesn't have the CONFIG_SPECULATION_MITIGATIONS option. Having this in the allow list for missing configs avoids a breakage in the TDX CI. Fixes: #4998 Signed-off-by: Fabiano Fidêncio --- tools/packaging/kernel/configs/fragments/whitelist.conf | 1 + tools/packaging/kernel/kata_config_version | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/packaging/kernel/configs/fragments/whitelist.conf b/tools/packaging/kernel/configs/fragments/whitelist.conf index 74d6a2ce41..ad89eac1b3 100644 --- a/tools/packaging/kernel/configs/fragments/whitelist.conf +++ b/tools/packaging/kernel/configs/fragments/whitelist.conf @@ -15,3 +15,4 @@ CONFIG_NF_LOG_COMMON CONFIG_MANDATORY_FILE_LOCKING CONFIG_ARM64_UAO CONFIG_VFIO_MDEV_DEVICE +CONFIG_SPECULATION_MITIGATIONS diff --git a/tools/packaging/kernel/kata_config_version b/tools/packaging/kernel/kata_config_version index 5595fa46c0..f906e1845d 100644 --- a/tools/packaging/kernel/kata_config_version +++ b/tools/packaging/kernel/kata_config_version @@ -1 +1 @@ -95 +96