diff --git a/tools/packaging/kernel/configs/fragments/common/lsm.conf b/tools/packaging/kernel/configs/fragments/common/lsm.conf index fa29f43159..6dc685fca7 100644 --- a/tools/packaging/kernel/configs/fragments/common/lsm.conf +++ b/tools/packaging/kernel/configs/fragments/common/lsm.conf @@ -7,5 +7,6 @@ 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 55b5d330d2..02aeda788f 100644 --- a/tools/packaging/kernel/configs/fragments/common/netfilter.conf +++ b/tools/packaging/kernel/configs/fragments/common/netfilter.conf @@ -190,6 +190,7 @@ 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 2270c9a14a..7bdc3de7a0 100644 --- a/tools/packaging/kernel/configs/fragments/common/network.conf +++ b/tools/packaging/kernel/configs/fragments/common/network.conf @@ -42,6 +42,7 @@ 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 3790678d9e..d6e04444f6 100644 --- a/tools/packaging/kernel/configs/fragments/whitelist.conf +++ b/tools/packaging/kernel/configs/fragments/whitelist.conf @@ -2,10 +2,6 @@ # without generating an error in fragment merging CONFIG_ARCH_RANDOM CONFIG_ARM64_CRYPTO -CONFIG_GENERIC_MSI_IRQ_DOMAIN -CONFIG_PCI_MSI_IRQ_DOMAIN -CONFIG_CLK_LGM_CGU -CONFIG_MEMCG_SWAP CONFIG_NF_NAT_IPV4 CONFIG_NF_NAT_NEEDED CONFIG_NF_NAT_PROTO_DCCP @@ -22,6 +18,3 @@ 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 dee79f1094..194b81caae 100644 --- a/tools/packaging/kernel/kata_config_version +++ b/tools/packaging/kernel/kata_config_version @@ -1 +1 @@ -114 +112 diff --git a/tools/packaging/kernel/patches/6.4.x/no_patches.txt b/tools/packaging/kernel/patches/6.4.x/no_patches.txt deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/versions.yaml b/versions.yaml index ca55aa44f4..e32ea79c8e 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.4.14" + version: "v6.1.38" sev: description: "Linux kernel that supports SEV and SNP" url: "https://cdn.kernel.org/pub/linux/kernel/v5.x/"