diff --git a/tools/packaging/kernel/configs/fragments/common/lsm.conf b/tools/packaging/kernel/configs/fragments/common/lsm.conf index 6dc685fca7..fa29f43159 100644 --- a/tools/packaging/kernel/configs/fragments/common/lsm.conf +++ b/tools/packaging/kernel/configs/fragments/common/lsm.conf @@ -7,6 +7,5 @@ CONFIG_SECURITY_NETWORK=y CONFIG_SECURITY_SELINUX=y CONFIG_SECURITY_SELINUX_BOOTPARAM=y CONFIG_SECURITY_SELINUX_DEVELOP=y -CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=0 CONFIG_SECURITY_SELINUX_SIDTAB_HASH_BITS=9 CONFIG_SECURITY_SELINUX_SID2STR_CACHE_SIZE=256 diff --git a/tools/packaging/kernel/configs/fragments/common/netfilter.conf b/tools/packaging/kernel/configs/fragments/common/netfilter.conf index 02aeda788f..55b5d330d2 100644 --- a/tools/packaging/kernel/configs/fragments/common/netfilter.conf +++ b/tools/packaging/kernel/configs/fragments/common/netfilter.conf @@ -190,7 +190,6 @@ CONFIG_IP_NF_TARGET_MASQUERADE=y CONFIG_IP_NF_TARGET_NETMAP=y CONFIG_IP_NF_TARGET_REDIRECT=y CONFIG_IP_NF_MANGLE=y -CONFIG_IP_NF_TARGET_CLUSTERIP=y CONFIG_IP_NF_TARGET_ECN=y CONFIG_IP_NF_TARGET_TTL=y CONFIG_IP_NF_RAW=y diff --git a/tools/packaging/kernel/configs/fragments/common/network.conf b/tools/packaging/kernel/configs/fragments/common/network.conf index 7bdc3de7a0..2270c9a14a 100644 --- a/tools/packaging/kernel/configs/fragments/common/network.conf +++ b/tools/packaging/kernel/configs/fragments/common/network.conf @@ -42,7 +42,6 @@ CONFIG_BRIDGE=y CONFIG_BRIDGE_IGMP_SNOOPING=y CONFIG_LLC=y CONFIG_NET_SCHED=y -CONFIG_NET_SCH_CBQ=y CONFIG_NET_SCH_MULTIQ=y CONFIG_NET_SCH_FQ_CODEL=y CONFIG_NET_SCH_FQ=y diff --git a/tools/packaging/kernel/configs/fragments/whitelist.conf b/tools/packaging/kernel/configs/fragments/whitelist.conf index d6e04444f6..ab88ff21b8 100644 --- a/tools/packaging/kernel/configs/fragments/whitelist.conf +++ b/tools/packaging/kernel/configs/fragments/whitelist.conf @@ -18,3 +18,6 @@ CONFIG_ARM64_UAO CONFIG_VFIO_MDEV_DEVICE CONFIG_SPECULATION_MITIGATIONS CONFIG_X86_SGX +CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE +CONFIG_IP_NF_TARGET_CLUSTERIP +CONFIG_NET_SCH_CBQ diff --git a/tools/packaging/kernel/kata_config_version b/tools/packaging/kernel/kata_config_version index 194b81caae..dee79f1094 100644 --- a/tools/packaging/kernel/kata_config_version +++ b/tools/packaging/kernel/kata_config_version @@ -1 +1 @@ -112 +114 diff --git a/tools/packaging/kernel/patches/6.4.x/no_patches.txt b/tools/packaging/kernel/patches/6.4.x/no_patches.txt new file mode 100644 index 0000000000..e69de29bb2 diff --git a/versions.yaml b/versions.yaml index 65bb063141..d8046cd13f 100644 --- a/versions.yaml +++ b/versions.yaml @@ -168,7 +168,7 @@ assets: kernel: description: "Linux kernel optimised for virtual machines" url: "https://cdn.kernel.org/pub/linux/kernel/v6.x/" - version: "v6.1.38" + version: "v6.4.14" sev: description: "Linux kernel that supports SEV and SNP" url: "https://cdn.kernel.org/pub/linux/kernel/v5.x/"