From ddd34f4c07679e634e1f5c4833e2f36748d00a52 Mon Sep 17 00:00:00 2001
From: "bottlerocket-kernels[bot]"
 <190893109+bottlerocket-kernels[bot]@users.noreply.github.com>
Date: Mon, 8 Jun 2026 19:06:27 +0000
Subject: [PATCH] kernel-6.18: update to 6.18.33

Rebase to Amazon Linux upstream version 6.18.33-63.124.amzn2023.

Signed-off-by: bottlerocket-kernels[bot] <190893109+bottlerocket-kernels[bot]@users.noreply.github.com>
---
 packages/kernel-6.18/Cargo.toml                               | 4 ++--
 .../kernel-6.18/config-full-bottlerocket-aarch64-on-aarch64   | 3 ++-
 .../kernel-6.18/config-full-bottlerocket-aarch64-on-x86_64    | 3 ++-
 .../kernel-6.18/config-full-bottlerocket-x86_64-on-aarch64    | 3 ++-
 .../kernel-6.18/config-full-bottlerocket-x86_64-on-x86_64     | 3 ++-
 packages/kernel-6.18/kernel-6.18.spec                         | 4 ++--
 6 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/packages/kernel-6.18/Cargo.toml b/packages/kernel-6.18/Cargo.toml
index 65a6c956..7b8321be 100644
--- a/packages/kernel-6.18/Cargo.toml
+++ b/packages/kernel-6.18/Cargo.toml
@@ -13,8 +13,8 @@ path = "../packages.rs"
 
 [[package.metadata.build-package.external-files]]
 # Use latest-kernel-srpm-url.sh to get this.
-url = "https://cdn.amazonlinux.com/al2023/blobstore/f82452e4fddb3f26f08c0c3c3e731306f5f0baf2001fd7ac78f7b25d9689f528/kernel6.18-6.18.30-61.116.amzn2023.src.rpm"
-sha512 = "53a9953abbcf9fa9dad851233e5a8814ea85d08d233792eced6fae57579ddf82945894397bc8611ce813e7d68a12c15c25c45618ccc3e8194cb0b04fba2bffef"
+url = "https://cdn.amazonlinux.com/al2023/blobstore/1a6ce3e0de662102df4139a8a3f620fb7c55e828df64b18be7e2b71a308cdd1b/kernel6.18-6.18.33-63.124.amzn2023.src.rpm"
+sha512 = "3c4b0c757a0695d595b36c95cd2e16dd35bbe568ae0b3a0e7dc54204a269fa4181ad96eba0d066710692694e2355db2c0670692594190eea0620bdcd6f549577"
 force-upstream = true
 
 [build-dependencies]
diff --git a/packages/kernel-6.18/config-full-bottlerocket-aarch64-on-aarch64 b/packages/kernel-6.18/config-full-bottlerocket-aarch64-on-aarch64
index 49a78274..18eab19f 100644
--- a/packages/kernel-6.18/config-full-bottlerocket-aarch64-on-aarch64
+++ b/packages/kernel-6.18/config-full-bottlerocket-aarch64-on-aarch64
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 6.18.30 Kernel Configuration
+# Linux/arm64 6.18.33 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="aarch64-bottlerocket-linux-gnu-gcc (Buildroot 2025.05.1) 13.4.0"
 CONFIG_CC_IS_GCC=y
@@ -5751,6 +5751,7 @@ CONFIG_CRYPTO_AKCIPHER=y
 CONFIG_CRYPTO_KPP2=y
 CONFIG_CRYPTO_KPP=y
 CONFIG_CRYPTO_ACOMP2=y
+CONFIG_CRYPTO_HKDF=y
 CONFIG_CRYPTO_MANAGER=y
 CONFIG_CRYPTO_MANAGER2=y
 CONFIG_CRYPTO_USER=m
diff --git a/packages/kernel-6.18/config-full-bottlerocket-aarch64-on-x86_64 b/packages/kernel-6.18/config-full-bottlerocket-aarch64-on-x86_64
index 49a78274..18eab19f 100644
--- a/packages/kernel-6.18/config-full-bottlerocket-aarch64-on-x86_64
+++ b/packages/kernel-6.18/config-full-bottlerocket-aarch64-on-x86_64
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 6.18.30 Kernel Configuration
+# Linux/arm64 6.18.33 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="aarch64-bottlerocket-linux-gnu-gcc (Buildroot 2025.05.1) 13.4.0"
 CONFIG_CC_IS_GCC=y
@@ -5751,6 +5751,7 @@ CONFIG_CRYPTO_AKCIPHER=y
 CONFIG_CRYPTO_KPP2=y
 CONFIG_CRYPTO_KPP=y
 CONFIG_CRYPTO_ACOMP2=y
+CONFIG_CRYPTO_HKDF=y
 CONFIG_CRYPTO_MANAGER=y
 CONFIG_CRYPTO_MANAGER2=y
 CONFIG_CRYPTO_USER=m
diff --git a/packages/kernel-6.18/config-full-bottlerocket-x86_64-on-aarch64 b/packages/kernel-6.18/config-full-bottlerocket-x86_64-on-aarch64
index 4b2cbf92..b5e29083 100644
--- a/packages/kernel-6.18/config-full-bottlerocket-x86_64-on-aarch64
+++ b/packages/kernel-6.18/config-full-bottlerocket-x86_64-on-aarch64
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 6.18.30 Kernel Configuration
+# Linux/x86 6.18.33 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="x86_64-bottlerocket-linux-gnu-gcc (Buildroot 2025.05.1) 13.4.0"
 CONFIG_CC_IS_GCC=y
@@ -5343,6 +5343,7 @@ CONFIG_CRYPTO_AKCIPHER=y
 CONFIG_CRYPTO_KPP2=y
 CONFIG_CRYPTO_KPP=y
 CONFIG_CRYPTO_ACOMP2=y
+CONFIG_CRYPTO_HKDF=y
 CONFIG_CRYPTO_MANAGER=y
 CONFIG_CRYPTO_MANAGER2=y
 CONFIG_CRYPTO_USER=m
diff --git a/packages/kernel-6.18/config-full-bottlerocket-x86_64-on-x86_64 b/packages/kernel-6.18/config-full-bottlerocket-x86_64-on-x86_64
index 4a3f5f96..d2b00fcb 100644
--- a/packages/kernel-6.18/config-full-bottlerocket-x86_64-on-x86_64
+++ b/packages/kernel-6.18/config-full-bottlerocket-x86_64-on-x86_64
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 6.18.30 Kernel Configuration
+# Linux/x86 6.18.33 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="x86_64-bottlerocket-linux-gnu-gcc (Buildroot 2025.05.1) 13.4.0"
 CONFIG_CC_IS_GCC=y
@@ -5345,6 +5345,7 @@ CONFIG_CRYPTO_AKCIPHER=y
 CONFIG_CRYPTO_KPP2=y
 CONFIG_CRYPTO_KPP=y
 CONFIG_CRYPTO_ACOMP2=y
+CONFIG_CRYPTO_HKDF=y
 CONFIG_CRYPTO_MANAGER=y
 CONFIG_CRYPTO_MANAGER2=y
 CONFIG_CRYPTO_USER=m
diff --git a/packages/kernel-6.18/kernel-6.18.spec b/packages/kernel-6.18/kernel-6.18.spec
index a67a8d82..871d78dd 100644
--- a/packages/kernel-6.18/kernel-6.18.spec
+++ b/packages/kernel-6.18/kernel-6.18.spec
@@ -6,13 +6,13 @@
 %global host_arch %(uname -m)
 
 Name: %{_cross_os}kernel-%{kmajor}
-Version: 6.18.30
+Version: 6.18.33
 Release: 1%{?dist}
 Summary: The Linux kernel
 License: GPL-2.0 WITH Linux-syscall-note
 URL: https://www.kernel.org/
 # Use latest-kernel-srpm-url.sh to get this.
-Source0: https://cdn.amazonlinux.com/al2023/blobstore/f82452e4fddb3f26f08c0c3c3e731306f5f0baf2001fd7ac78f7b25d9689f528/kernel6.18-6.18.30-61.116.amzn2023.src.rpm
+Source0: https://cdn.amazonlinux.com/al2023/blobstore/1a6ce3e0de662102df4139a8a3f620fb7c55e828df64b18be7e2b71a308cdd1b/kernel6.18-6.18.33-63.124.amzn2023.src.rpm
 Source1: gpgkey-B21C50FA44A99720EAA72F7FE951904AD832C631.asc
 
 # Custom Bottlerocket kernel configurations.