Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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

This file was deleted.

This file was deleted.

This file was deleted.

4 changes: 2 additions & 2 deletions packages/kernel-6.12/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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/d0dc627f720e98b4afe1557287c2b445357e29b3d2abb600e3fb873af09f3924/kernel6.12-6.12.110-135.202.amzn2023.src.rpm"
sha512 = "6bcc12f5be6a8037c409818d251280fff308667e4e58f58648381b7c5ee7d4d34071c645965fe86559067cca8d635027d486d016c0e34c1505eb4f5464bbe0dd"
url = "https://cdn.amazonlinux.com/al2023/blobstore/72dd8b871c8d434ffb1975a45d3ed31bdec2db818fbf644a190926bad06f6ae8/kernel6.12-6.12.111-136.204.amzn2023.src.rpm"
sha512 = "b1ef2dd83c51e71f034676297b709cc6b1de53acc8f237057b59515f38608fbf93fa35e688ecc7bdaafd873916e6372b70a23a64ea59e7d97077ac23a3933e62"
force-upstream = true

[[package.metadata.build-package.external-files]]
Expand Down
2 changes: 1 addition & 1 deletion packages/kernel-6.12/config-full-bottlerocket-aarch64
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
# Linux/arm64 6.12.110 Kernel Configuration
# Linux/arm64 6.12.111 Kernel Configuration
#
CONFIG_CC_VERSION_TEXT="aarch64-bottlerocket-linux-gnu-gcc (Buildroot 2025.05.1) 13.4.0"
CONFIG_CC_IS_GCC=y
Expand Down
2 changes: 1 addition & 1 deletion packages/kernel-6.12/config-full-bottlerocket-x86_64
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
# Linux/x86 6.12.110 Kernel Configuration
# Linux/x86 6.12.111 Kernel Configuration
#
CONFIG_CC_VERSION_TEXT="x86_64-bottlerocket-linux-gnu-gcc (Buildroot 2025.05.1) 13.4.0"
CONFIG_CC_IS_GCC=y
Expand Down
10 changes: 2 additions & 8 deletions packages/kernel-6.12/kernel-6.12.spec
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@
%global neuron_inf1_ver 2.24.13

Name: %{_cross_os}kernel-%{kmajor}
Version: 6.12.110
Version: 6.12.111
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/d0dc627f720e98b4afe1557287c2b445357e29b3d2abb600e3fb873af09f3924/kernel6.12-6.12.110-135.202.amzn2023.src.rpm
Source0: https://cdn.amazonlinux.com/al2023/blobstore/72dd8b871c8d434ffb1975a45d3ed31bdec2db818fbf644a190926bad06f6ae8/kernel6.12-6.12.111-136.204.amzn2023.src.rpm
Source1: gpgkey-B21C50FA44A99720EAA72F7FE951904AD832C631.asc

# Custom Bottlerocket kernel configurations.
Expand Down Expand Up @@ -75,14 +75,8 @@ Patch1006: 1006-Select-prerequisites-for-gpu-drivers.patch
# Backport patch to ensure NUL-terminated task->comm buffer
Patch1007: 1007-strscpy-write-destination-buffer-only-once.patch
Patch1008: 1008-Revert-selinux-fix-overlayfs-mmap-and-mprotect-acces.patch
# Fix use-after-free in the Nitro Enclaves enclave-creation error path
Patch1009: 1009-nitro_enclaves-fix-use-after-free-on-SLOT_ALLOC-fail.patch
# Backport patch to disable LZ4 rolling decompression on EROFS
Patch1010: 1010-erofs-disable-LZ4-rolling-decompression-for-now.patch
Comment on lines 78 to 79

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.

nonblocking nit, happy for this to be a follow up

Suggested change
# Backport patch to disable LZ4 rolling decompression on EROFS
Patch1010: 1010-erofs-disable-LZ4-rolling-decompression-for-now.patch
# Backport patch to disable LZ4 rolling decompression on EROFS
Patch1009: 1009-erofs-disable-LZ4-rolling-decompression-for-now.patch

# Reserve blocks for XFS parent pointer updates to avoid a filesystem shutdown
Patch1011: 1011-xfs-initialise-args-total-for-parent-pointer-updates.patch
# Revert accounting change that triggers a NULL-deref panic during memcg reclaim of split xarray nodes.
Patch1012: 1012-Revert-xarray-honor-XA_FLAGS_ACCOUNT-in-xas_split_a.patch

BuildRequires: bc
BuildRequires: elfutils-devel
Expand Down
Loading