diff --git a/tools/packaging/kernel/configs/fragments/whitelist.conf b/tools/packaging/kernel/configs/fragments/whitelist.conf index a9184b149c..d6e04444f6 100644 --- a/tools/packaging/kernel/configs/fragments/whitelist.conf +++ b/tools/packaging/kernel/configs/fragments/whitelist.conf @@ -1,5 +1,7 @@ # configuration options which may dropped in newer kernels # without generating an error in fragment merging +CONFIG_ARCH_RANDOM +CONFIG_ARM64_CRYPTO CONFIG_NF_NAT_IPV4 CONFIG_NF_NAT_NEEDED CONFIG_NF_NAT_PROTO_DCCP @@ -7,6 +9,7 @@ CONFIG_NF_NAT_PROTO_GRE CONFIG_NF_NAT_PROTO_SCTP CONFIG_NF_NAT_PROTO_UDPLITE CONFIG_REFCOUNT_FULL +CONFIG_MEMCG_SWAP CONFIG_MEMCG_SWAP_ENABLED CONFIG_HAVE_NET_DSA CONFIG_NF_LOG_COMMON diff --git a/tools/packaging/kernel/kata_config_version b/tools/packaging/kernel/kata_config_version index bc6298e80a..58c9bdf9d0 100644 --- a/tools/packaging/kernel/kata_config_version +++ b/tools/packaging/kernel/kata_config_version @@ -1 +1 @@ -110 +111 diff --git a/tools/packaging/kernel/patches/6.1.x/no_patches.txt b/tools/packaging/kernel/patches/6.1.x/no_patches.txt new file mode 100644 index 0000000000..e69de29bb2 diff --git a/versions.yaml b/versions.yaml index a1ce76f9ff..2fc4fc7ea8 100644 --- a/versions.yaml +++ b/versions.yaml @@ -168,8 +168,8 @@ assets: kernel: description: "Linux kernel optimised for virtual machines" - url: "https://cdn.kernel.org/pub/linux/kernel/v5.x/" - version: "v5.19.2" + url: "https://cdn.kernel.org/pub/linux/kernel/v6.x/" + version: "v6.1.38" sev: description: "Linux kernel that supports SEV and SNP" url: "https://cdn.kernel.org/pub/linux/kernel/v5.x/"