Skip to content

[AUTOPATCHER-kernel] Kernel upgrade to version 6.18.36.1 - branch 3.0-dev #17790

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
CBL-Mariner-Bot wants to merge 4 commits into
base: 3.0-dev
Choose a base branch
from
Open

[AUTOPATCHER-kernel] Kernel upgrade to version 6.18.36.1 - branch 3.0-dev #17790

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
771641a
Kernel upgrade to 6.18.36.1 version
CBL-Mariner-Bot Jun 23, 2026
cb25b81
Apply config changes to AMD64
CBL-Mariner-Bot Jun 23, 2026
4b24383
Apply config changes to ARM64
CBL-Mariner-Bot Jun 23, 2026
a4e8811
fix(kernel-hwe): disable CRYPTO_XXHASH
rlmenge Jun 24, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion SPECS-SIGNED/kernel-hwe-signed/kernel-hwe-signed.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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 <cblmargh@microsoft.com> - 6.18.36.1-1
- Auto-upgrade to 6.18.36.1

* Fri May 22 2026 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 6.18.31.1-1
- Auto-upgrade to 6.18.31.1

Expand Down
2 changes: 1 addition & 1 deletion SPECS/kernel-hwe-headers/kernel-hwe-headers.signatures.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"Signatures": {
"kernel-hwe-6.18.31.1.tar.gz": "29c90122e3748b0e1e78f056e8adf02c04c7c808e24eecb2abaf0ec8f2c36326"
"kernel-hwe-6.18.36.1.tar.gz": "9f5f91e212938a115eea2f7e6ec95949c89702a9e3c9293626a4c72d8f0923eb"
}
}
5 changes: 4 additions & 1 deletion SPECS/kernel-hwe-headers/kernel-hwe-headers.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -35,6 +35,9 @@ cp -rv usr/include/* /%{buildroot}%{_includedir}
%{_includedir}/*

%changelog
* Tue Jun 23 2026 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 6.18.36.1-1
- Auto-upgrade to 6.18.36.1

* Fri May 22 2026 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 6.18.31.1-1
- Auto-upgrade to 6.18.31.1

Expand Down
6 changes: 4 additions & 2 deletions SPECS/kernel-hwe/config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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

@rlmenge rlmenge Jun 24, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Result of microsoft/CBL-Mariner-Linux-Kernel@3a519c3

CONFIG_MLX5_VFIO_PCI=m
CONFIG_VIRTIO_VFIO_PCI=m
CONFIG_VIRTIO_VFIO_PCI_ADMIN_LEGACY=y
Expand Down Expand Up @@ -7464,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

@rlmenge rlmenge Jun 24, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Result of microsoft/CBL-Mariner-Linux-Kernel@7b35846

CRYPTO_XXHASH is a non‑cryptographic hash which is no longer needed for btrfs; therefore, disable

# end of Hashes, digests, and MACs

#
Expand Down Expand Up @@ -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

@rlmenge rlmenge Jun 24, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Result of microsoft/CBL-Mariner-Linux-Kernel@7b35846

CONFIG_CRYPTO_LIB_BLAKE2S_ARCH=y
CONFIG_CRYPTO_LIB_CHACHA=y
CONFIG_CRYPTO_LIB_CHACHA_ARCH=y
Expand Down
6 changes: 4 additions & 2 deletions SPECS/kernel-hwe/config_aarch64
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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

@rlmenge rlmenge Jun 24, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Result of microsoft/CBL-Mariner-Linux-Kernel@d4fd428

CONFIG_CAVIUM_ERRATUM_22375=y
CONFIG_CAVIUM_ERRATUM_23144=y
CONFIG_CAVIUM_ERRATUM_23154=y
Expand Down Expand Up @@ -11758,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

#
Expand Down Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions SPECS/kernel-hwe/kernel-hwe.signatures.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{
"Signatures": {
"azurelinux-ca-20230216.pem": "d545401163c75878319f01470455e6bc18a5968e39dd964323225e3fe308849b",
"config": "677b6680791b3051cf8efce56213fa4271817bba3c0022c3872eb5153f491205",
"config_aarch64": "375718abe0bd8d90a3a7b2481ec60e6088fb1dc654f6668b87e66b35bec269c8",
"config": "ba6347d174208cb364d7cd9e019c88c2f9a90ec57b689e875db122b41bd5338f",
"config_aarch64": "3d8317ee01a2c6e27d2ef74146354877f5350456e5ac8a200aa6beab7cb9336c",
"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"
}
}
5 changes: 4 additions & 1 deletion SPECS/kernel-hwe/kernel-hwe.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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 <cblmargh@microsoft.com> - 6.18.36.1-1
- Auto-upgrade to 6.18.36.1

* Fri May 22 2026 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 6.18.31.1-1
- Auto-upgrade to 6.18.31.1

Expand Down
8 changes: 4 additions & 4 deletions cgmanifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
},
Expand All @@ -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"
}
}
},
Expand Down
Loading