kernel-6.1: update to 6.1.119

Rebase to Amazon Linux upstream version 6.1.119-129.201.amzn2023. Remove io_uring patch as AL's 6.1 latest kernel release includes the patch for io_uring in tree: * https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=linux-6.1.y&id=9f5a834715d04f32cb8a8d25fe329d67e7d16e46 * amazonlinux/linux@9f5a834 Also, add the module for z3fold back in. Signed-off-by: Gavin Inglis <[email protected]>
bottlerocket-os · Dec 10, 2024 · 53f065d · 53f065d
1 parent 199f8a3
commit 53f065d
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 66 deletions.
diff --git a/packages/kernel-6.1/1100-io_uring-always-lock-__io_cqring_overflow_flush.patch b/packages/kernel-6.1/1100-io_uring-always-lock-__io_cqring_overflow_flush.patch
diff --git a/packages/kernel-6.1/Cargo.toml b/packages/kernel-6.1/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/d6984bd6e9f17839ebf3e0b0c4d7dd72aeb4db5911bf697ed299caea93c83327/kernel-6.1.115-126.197.amzn2023.src.rpm"
-sha512 = "eb1e9bdbbcc4b74cc678c894b19279437e1396c56e9db0904d1dd6898e6babf4fa3c4c53908ca189ee8558c5d249314a819b255f183fe100e4a3ed068ce2e6cf"
+url = "https://cdn.amazonlinux.com/al2023/blobstore/c5625ba4f37a38809773fa50b769735602f1e4e50d60cb7127ed6231d0695e95/kernel-6.1.119-129.201.amzn2023.src.rpm"
+sha512 = "258a96b9216c187352405f856d69d0fd7edb2e9c89066ad098c9e50bbdfc0c13c666d74fe8b919fa5ffa03dc9f802bff454b03e7f455cf2d3d92a4a66c7d4987"
 force-upstream = true
 
 [[package.metadata.build-package.external-files]]

diff --git a/packages/kernel-6.1/kernel-6.1.spec b/packages/kernel-6.1/kernel-6.1.spec
@@ -1,13 +1,13 @@
 %global debug_package %{nil}
 
 Name: %{_cross_os}kernel-6.1
-Version: 6.1.115
+Version: 6.1.119
 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/d6984bd6e9f17839ebf3e0b0c4d7dd72aeb4db5911bf697ed299caea93c83327/kernel-6.1.115-126.197.amzn2023.src.rpm
+Source0: https://cdn.amazonlinux.com/al2023/blobstore/c5625ba4f37a38809773fa50b769735602f1e4e50d60cb7127ed6231d0695e95/kernel-6.1.119-129.201.amzn2023.src.rpm
 # Use latest-neuron-srpm-url.sh to get this.
 Source1: https://yum.repos.neuron.amazonaws.com/aws-neuronx-dkms-2.18.12.0.noarch.rpm
 
@@ -42,8 +42,6 @@ Patch1004: 1004-af_unix-increase-default-max_dgram_qlen-to-512.patch
 # Drop AL revert of upstream patch to minimize delta. The necessary dependency
 # options for nvidia are instead included through DRM_SIMPLE
 Patch1005: 1005-Revert-Revert-drm-fb_helper-improve-CONFIG_FB-depend.patch
-# Prevent applications using io_uring from hanging
-Patch1100: 1100-io_uring-always-lock-__io_cqring_overflow_flush.patch
 
 BuildRequires: bc
 BuildRequires: elfutils-devel
@@ -1014,6 +1012,7 @@ install -p -m 0644 %{S:302} %{buildroot}%{_cross_bootconfigdir}/05-metal.conf
 %{_cross_kmoddir}/kernel/lib/ts_fsm.ko.*
 %{_cross_kmoddir}/kernel/lib/ts_kmp.ko.*
 %{_cross_kmoddir}/kernel/lib/zstd/zstd_compress.ko.*
+%{_cross_kmoddir}/kernel/mm/z3fold.ko.*
 %{_cross_kmoddir}/kernel/mm/zsmalloc.ko.*
 %{_cross_kmoddir}/kernel/net/8021q/8021q.ko.*
 %{_cross_kmoddir}/kernel/net/802/garp.ko.*