From 771641a843f495306220299cfea574e07b5f6aee Mon Sep 17 00:00:00 2001 From: CBL-Mariner Servicing Account Date: Tue, 23 Jun 2026 21:48:37 +0000 Subject: [PATCH 1/4] Kernel upgrade to 6.18.36.1 version --- SPECS-SIGNED/kernel-hwe-signed/kernel-hwe-signed.spec | 5 ++++- .../kernel-hwe-headers/kernel-hwe-headers.signatures.json | 2 +- SPECS/kernel-hwe-headers/kernel-hwe-headers.spec | 5 ++++- SPECS/kernel-hwe/config | 2 +- SPECS/kernel-hwe/config_aarch64 | 2 +- SPECS/kernel-hwe/kernel-hwe.signatures.json | 6 +++--- SPECS/kernel-hwe/kernel-hwe.spec | 5 ++++- cgmanifest.json | 8 ++++---- 8 files changed, 22 insertions(+), 13 deletions(-) diff --git a/SPECS-SIGNED/kernel-hwe-signed/kernel-hwe-signed.spec b/SPECS-SIGNED/kernel-hwe-signed/kernel-hwe-signed.spec index b0b046a6d3b..859e5ef8cf5 100644 --- a/SPECS-SIGNED/kernel-hwe-signed/kernel-hwe-signed.spec +++ b/SPECS-SIGNED/kernel-hwe-signed/kernel-hwe-signed.spec @@ -9,7 +9,7 @@ %define uname_r %{version}-%{release} Summary: Signed Linux Kernel for %{buildarch} systems Name: kernel-hwe-signed-%{buildarch} -Version: 6.18.31.1 +Version: 6.18.36.1 Release: 1%{?dist} License: GPLv2 Vendor: Microsoft Corporation @@ -108,6 +108,9 @@ echo "initrd of kernel %{uname_r} removed" >&2 %exclude /module_info.ld %changelog +* Tue Jun 23 2026 CBL-Mariner Servicing Account - 6.18.36.1-1 +- Auto-upgrade to 6.18.36.1 + * Fri May 22 2026 CBL-Mariner Servicing Account - 6.18.31.1-1 - Auto-upgrade to 6.18.31.1 diff --git a/SPECS/kernel-hwe-headers/kernel-hwe-headers.signatures.json b/SPECS/kernel-hwe-headers/kernel-hwe-headers.signatures.json index 2d6a9732820..371c88b7365 100644 --- a/SPECS/kernel-hwe-headers/kernel-hwe-headers.signatures.json +++ b/SPECS/kernel-hwe-headers/kernel-hwe-headers.signatures.json @@ -1,5 +1,5 @@ { "Signatures": { - "kernel-hwe-6.18.31.1.tar.gz": "29c90122e3748b0e1e78f056e8adf02c04c7c808e24eecb2abaf0ec8f2c36326" + "kernel-hwe-6.18.36.1.tar.gz": "9f5f91e212938a115eea2f7e6ec95949c89702a9e3c9293626a4c72d8f0923eb" } } diff --git a/SPECS/kernel-hwe-headers/kernel-hwe-headers.spec b/SPECS/kernel-hwe-headers/kernel-hwe-headers.spec index cc2a2849c7b..f321d461650 100644 --- a/SPECS/kernel-hwe-headers/kernel-hwe-headers.spec +++ b/SPECS/kernel-hwe-headers/kernel-hwe-headers.spec @@ -3,7 +3,7 @@ Summary: Linux API header files Name: kernel-hwe-headers -Version: 6.18.31.1 +Version: 6.18.36.1 Release: 1%{?dist} License: GPLv2 Vendor: Microsoft Corporation @@ -35,6 +35,9 @@ cp -rv usr/include/* /%{buildroot}%{_includedir} %{_includedir}/* %changelog +* Tue Jun 23 2026 CBL-Mariner Servicing Account - 6.18.36.1-1 +- Auto-upgrade to 6.18.36.1 + * Fri May 22 2026 CBL-Mariner Servicing Account - 6.18.31.1-1 - Auto-upgrade to 6.18.31.1 diff --git a/SPECS/kernel-hwe/config b/SPECS/kernel-hwe/config index 9357dd4a8ba..2a5c14904aa 100644 --- a/SPECS/kernel-hwe/config +++ b/SPECS/kernel-hwe/config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86_64 6.18.31.1 Kernel Configuration +# Linux/x86_64 6.18.36.1 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 13.2.0" CONFIG_CC_IS_GCC=y diff --git a/SPECS/kernel-hwe/config_aarch64 b/SPECS/kernel-hwe/config_aarch64 index 7768beca1fb..bf0ca259486 100644 --- a/SPECS/kernel-hwe/config_aarch64 +++ b/SPECS/kernel-hwe/config_aarch64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm64 6.18.31.1 Kernel Configuration +# Linux/arm64 6.18.36.1 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 13.2.0" CONFIG_CC_IS_GCC=y diff --git a/SPECS/kernel-hwe/kernel-hwe.signatures.json b/SPECS/kernel-hwe/kernel-hwe.signatures.json index 7b60b3e5f26..28d21c8486e 100644 --- a/SPECS/kernel-hwe/kernel-hwe.signatures.json +++ b/SPECS/kernel-hwe/kernel-hwe.signatures.json @@ -1,11 +1,11 @@ { "Signatures": { "azurelinux-ca-20230216.pem": "d545401163c75878319f01470455e6bc18a5968e39dd964323225e3fe308849b", - "config": "677b6680791b3051cf8efce56213fa4271817bba3c0022c3872eb5153f491205", - "config_aarch64": "375718abe0bd8d90a3a7b2481ec60e6088fb1dc654f6668b87e66b35bec269c8", + "config": "4ec4f79f20899dbea3bfcf7fa5f04dbcb97887f333dd8be42a56e4445e0172a8", + "config_aarch64": "a2d2bc9b76604df033bca68c84c3dacd9dca755c5c0c8161845e7e625118a4ec", "cpupower": "d7518767bf2b1110d146a49c7d42e76b803f45eb8bd14d931aa6d0d346fae985", "cpupower.service": "b057fe9e5d0e8c36f485818286b80e3eba8ff66ff44797940e99b1fd5361bb98", "sha512hmac-openssl.sh": "8bb4094cb09cd7a8bced236ccb44c3cabc82716679ce497bf040332897e47cd0", - "kernel-hwe-6.18.31.1.tar.gz": "29c90122e3748b0e1e78f056e8adf02c04c7c808e24eecb2abaf0ec8f2c36326" + "kernel-hwe-6.18.36.1.tar.gz": "9f5f91e212938a115eea2f7e6ec95949c89702a9e3c9293626a4c72d8f0923eb" } } diff --git a/SPECS/kernel-hwe/kernel-hwe.spec b/SPECS/kernel-hwe/kernel-hwe.spec index a48194007ed..ded7eff6353 100644 --- a/SPECS/kernel-hwe/kernel-hwe.spec +++ b/SPECS/kernel-hwe/kernel-hwe.spec @@ -30,7 +30,7 @@ Summary: Linux Kernel Name: kernel-hwe -Version: 6.18.31.1 +Version: 6.18.36.1 Release: 1%{?dist} License: GPLv2 Vendor: Microsoft Corporation @@ -430,6 +430,9 @@ echo "initrd of kernel %{uname_r} removed" >&2 %{_sysconfdir}/bash_completion.d/bpftool %changelog +* Tue Jun 23 2026 CBL-Mariner Servicing Account - 6.18.36.1-1 +- Auto-upgrade to 6.18.36.1 + * Fri May 22 2026 CBL-Mariner Servicing Account - 6.18.31.1-1 - Auto-upgrade to 6.18.31.1 diff --git a/cgmanifest.json b/cgmanifest.json index e9c8fd38f6d..114d4bc1961 100644 --- a/cgmanifest.json +++ b/cgmanifest.json @@ -8401,8 +8401,8 @@ "type": "other", "other": { "name": "kernel-hwe", - "version": "6.18.31.1", - "downloadUrl": "https://github.com/microsoft/CBL-Mariner-Linux-Kernel/archive/rolling-lts/azl3-hwe/6.18.31.1.tar.gz" + "version": "6.18.36.1", + "downloadUrl": "https://github.com/microsoft/CBL-Mariner-Linux-Kernel/archive/rolling-lts/azl3-hwe/6.18.36.1.tar.gz" } } }, @@ -8411,8 +8411,8 @@ "type": "other", "other": { "name": "kernel-hwe-headers", - "version": "6.18.31.1", - "downloadUrl": "https://github.com/microsoft/CBL-Mariner-Linux-Kernel/archive/rolling-lts/azl3-hwe/6.18.31.1.tar.gz" + "version": "6.18.36.1", + "downloadUrl": "https://github.com/microsoft/CBL-Mariner-Linux-Kernel/archive/rolling-lts/azl3-hwe/6.18.36.1.tar.gz" } } }, From cb25b81a0b20f13c204faebbad31585f065dc926 Mon Sep 17 00:00:00 2001 From: CBL-Mariner Servicing Account Date: Tue, 23 Jun 2026 22:04:59 +0000 Subject: [PATCH 2/4] Apply config changes to AMD64 --- SPECS/kernel-hwe/config | 2 ++ SPECS/kernel-hwe/kernel-hwe.signatures.json | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/SPECS/kernel-hwe/config b/SPECS/kernel-hwe/config index 2a5c14904aa..7a2d6c3bb27 100644 --- a/SPECS/kernel-hwe/config +++ b/SPECS/kernel-hwe/config @@ -6333,6 +6333,7 @@ CONFIG_VFIO_PCI_INTX=y CONFIG_VFIO_PCI=m CONFIG_VFIO_PCI_VGA=y CONFIG_VFIO_PCI_IGD=y +CONFIG_VFIO_PCI_DMABUF=y CONFIG_MLX5_VFIO_PCI=m CONFIG_VIRTIO_VFIO_PCI=m CONFIG_VIRTIO_VFIO_PCI_ADMIN_LEGACY=y @@ -7636,6 +7637,7 @@ CONFIG_CRYPTO_LIB_AESCFB=y CONFIG_CRYPTO_LIB_AESGCM=y CONFIG_CRYPTO_LIB_ARC4=m CONFIG_CRYPTO_LIB_GF128MUL=y +CONFIG_CRYPTO_LIB_BLAKE2B=m CONFIG_CRYPTO_LIB_BLAKE2S_ARCH=y CONFIG_CRYPTO_LIB_CHACHA=y CONFIG_CRYPTO_LIB_CHACHA_ARCH=y diff --git a/SPECS/kernel-hwe/kernel-hwe.signatures.json b/SPECS/kernel-hwe/kernel-hwe.signatures.json index 28d21c8486e..fa971768e4c 100644 --- a/SPECS/kernel-hwe/kernel-hwe.signatures.json +++ b/SPECS/kernel-hwe/kernel-hwe.signatures.json @@ -1,7 +1,7 @@ { "Signatures": { "azurelinux-ca-20230216.pem": "d545401163c75878319f01470455e6bc18a5968e39dd964323225e3fe308849b", - "config": "4ec4f79f20899dbea3bfcf7fa5f04dbcb97887f333dd8be42a56e4445e0172a8", + "config": "e9db3365f5ddada3289a04152c96e551d34981943df6a4b873febc251393136b", "config_aarch64": "a2d2bc9b76604df033bca68c84c3dacd9dca755c5c0c8161845e7e625118a4ec", "cpupower": "d7518767bf2b1110d146a49c7d42e76b803f45eb8bd14d931aa6d0d346fae985", "cpupower.service": "b057fe9e5d0e8c36f485818286b80e3eba8ff66ff44797940e99b1fd5361bb98", From 4b2438370c5ee9c8b9e127e91e3a80a5380f8fed Mon Sep 17 00:00:00 2001 From: CBL-Mariner Servicing Account Date: Tue, 23 Jun 2026 22:05:08 +0000 Subject: [PATCH 3/4] Apply config changes to ARM64 --- SPECS/kernel-hwe/config_aarch64 | 2 ++ SPECS/kernel-hwe/kernel-hwe.signatures.json | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/SPECS/kernel-hwe/config_aarch64 b/SPECS/kernel-hwe/config_aarch64 index bf0ca259486..4b9acee6951 100644 --- a/SPECS/kernel-hwe/config_aarch64 +++ b/SPECS/kernel-hwe/config_aarch64 @@ -460,6 +460,7 @@ CONFIG_ARM64_ERRATUM_2966298=y CONFIG_ARM64_ERRATUM_3117295=y CONFIG_ARM64_ERRATUM_3194386=y CONFIG_ARM64_ERRATUM_4193714=y +CONFIG_ARM64_ERRATUM_4118414=y CONFIG_CAVIUM_ERRATUM_22375=y CONFIG_CAVIUM_ERRATUM_23144=y CONFIG_CAVIUM_ERRATUM_23154=y @@ -11972,6 +11973,7 @@ CONFIG_CRYPTO_LIB_UTILS=y CONFIG_CRYPTO_LIB_AES=y CONFIG_CRYPTO_LIB_ARC4=m CONFIG_CRYPTO_LIB_GF128MUL=y +CONFIG_CRYPTO_LIB_BLAKE2B=m CONFIG_CRYPTO_LIB_CHACHA=y CONFIG_CRYPTO_LIB_CHACHA_ARCH=y CONFIG_CRYPTO_LIB_CURVE25519=m diff --git a/SPECS/kernel-hwe/kernel-hwe.signatures.json b/SPECS/kernel-hwe/kernel-hwe.signatures.json index fa971768e4c..42dde1ac943 100644 --- a/SPECS/kernel-hwe/kernel-hwe.signatures.json +++ b/SPECS/kernel-hwe/kernel-hwe.signatures.json @@ -2,7 +2,7 @@ "Signatures": { "azurelinux-ca-20230216.pem": "d545401163c75878319f01470455e6bc18a5968e39dd964323225e3fe308849b", "config": "e9db3365f5ddada3289a04152c96e551d34981943df6a4b873febc251393136b", - "config_aarch64": "a2d2bc9b76604df033bca68c84c3dacd9dca755c5c0c8161845e7e625118a4ec", + "config_aarch64": "2e1363912757e0f56c052405143a4310492a161e10489f66bbcd1f3e24cf0c6d", "cpupower": "d7518767bf2b1110d146a49c7d42e76b803f45eb8bd14d931aa6d0d346fae985", "cpupower.service": "b057fe9e5d0e8c36f485818286b80e3eba8ff66ff44797940e99b1fd5361bb98", "sha512hmac-openssl.sh": "8bb4094cb09cd7a8bced236ccb44c3cabc82716679ce497bf040332897e47cd0", From a4e8811743bb469376ce1d479b50ae708ed34932 Mon Sep 17 00:00:00 2001 From: Rachel Menge Date: Wed, 24 Jun 2026 13:14:26 -0700 Subject: [PATCH 4/4] fix(kernel-hwe): disable CRYPTO_XXHASH --- SPECS/kernel-hwe/config | 2 +- SPECS/kernel-hwe/config_aarch64 | 2 +- SPECS/kernel-hwe/kernel-hwe.signatures.json | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/SPECS/kernel-hwe/config b/SPECS/kernel-hwe/config index 7a2d6c3bb27..4d385e8a959 100644 --- a/SPECS/kernel-hwe/config +++ b/SPECS/kernel-hwe/config @@ -7465,7 +7465,7 @@ CONFIG_CRYPTO_SHA3=y # CONFIG_CRYPTO_STREEBOG is not set # CONFIG_CRYPTO_WP512 is not set # CONFIG_CRYPTO_XCBC is not set -CONFIG_CRYPTO_XXHASH=m +# CONFIG_CRYPTO_XXHASH is not set # end of Hashes, digests, and MACs # diff --git a/SPECS/kernel-hwe/config_aarch64 b/SPECS/kernel-hwe/config_aarch64 index 4b9acee6951..cd57c7f197b 100644 --- a/SPECS/kernel-hwe/config_aarch64 +++ b/SPECS/kernel-hwe/config_aarch64 @@ -11759,7 +11759,7 @@ CONFIG_CRYPTO_SM3_GENERIC=m # CONFIG_CRYPTO_STREEBOG is not set # CONFIG_CRYPTO_WP512 is not set # CONFIG_CRYPTO_XCBC is not set -CONFIG_CRYPTO_XXHASH=m +# CONFIG_CRYPTO_XXHASH is not set # end of Hashes, digests, and MACs # diff --git a/SPECS/kernel-hwe/kernel-hwe.signatures.json b/SPECS/kernel-hwe/kernel-hwe.signatures.json index 42dde1ac943..eb0fdda1641 100644 --- a/SPECS/kernel-hwe/kernel-hwe.signatures.json +++ b/SPECS/kernel-hwe/kernel-hwe.signatures.json @@ -1,8 +1,8 @@ { "Signatures": { "azurelinux-ca-20230216.pem": "d545401163c75878319f01470455e6bc18a5968e39dd964323225e3fe308849b", - "config": "e9db3365f5ddada3289a04152c96e551d34981943df6a4b873febc251393136b", - "config_aarch64": "2e1363912757e0f56c052405143a4310492a161e10489f66bbcd1f3e24cf0c6d", + "config": "ba6347d174208cb364d7cd9e019c88c2f9a90ec57b689e875db122b41bd5338f", + "config_aarch64": "3d8317ee01a2c6e27d2ef74146354877f5350456e5ac8a200aa6beab7cb9336c", "cpupower": "d7518767bf2b1110d146a49c7d42e76b803f45eb8bd14d931aa6d0d346fae985", "cpupower.service": "b057fe9e5d0e8c36f485818286b80e3eba8ff66ff44797940e99b1fd5361bb98", "sha512hmac-openssl.sh": "8bb4094cb09cd7a8bced236ccb44c3cabc82716679ce497bf040332897e47cd0",