Merge pull request #280 from bottlerocket-os/update_2025-09-29_6.12

kernel-6.12 : update to 6.12.46-66.121

Author: vyaghras

packages/kernel-6.12/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/d9f128189bb87083f93221463a88c2b9051e274502707f2eb0de8fa461646e2d/kernel6.12-6.12.40-64.114.amzn2023.src.rpm"
-sha512 = "17cb2df6ba6f5d31719815243a1bde156f822354e50a57405b51a49827e0c29ae0db3155ca7811036ee059e169b8f320d8c87d15cbdb829bc095c6f6aa6208a8"
+url = "https://cdn.amazonlinux.com/al2023/blobstore/90e970acea5d658008c0707a6c4953b0e877f85b122cd967525bfecb043af96b/kernel6.12-6.12.46-66.121.amzn2023.src.rpm"
+sha512 = "ca7fc22f52e6d0c29d02ed2d51636a63e460d4ec5f2ac49a2cd0ad901af1031ff5741fc54c91388572b03518a250f9901ed68ad9650e37a6abb655e1277239a6"
 force-upstream = true
 
 [[package.metadata.build-package.external-files]]

packages/kernel-6.12/config-full-bottlerocket-aarch64

@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 6.12.40 Kernel Configuration
+# Linux/arm64 6.12.46 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="aarch64-bottlerocket-linux-gnu-gcc (Buildroot 2024.11.1) 13.3.0"
 CONFIG_CC_IS_GCC=y
@@ -108,7 +108,6 @@ CONFIG_BPF_JIT=y
 CONFIG_BPF_JIT_ALWAYS_ON=y
 CONFIG_BPF_JIT_DEFAULT_ON=y
 CONFIG_BPF_UNPRIV_DEFAULT_OFF=y
-CONFIG_USERMODE_DRIVER=y
 CONFIG_BPF_PRELOAD=y
 CONFIG_BPF_PRELOAD_UMD=m
 CONFIG_BPF_LSM=y
@@ -4776,6 +4775,7 @@ CONFIG_VHOST_NET=m
 # CONFIG_VHOST_SCSI is not set
 CONFIG_VHOST_VSOCK=m
 # CONFIG_VHOST_CROSS_ENDIAN_LEGACY is not set
+CONFIG_VHOST_ENABLE_FORK_OWNER_CONTROL=y
 
 #
 # Microsoft Hyper-V guest support

packages/kernel-6.12/config-full-bottlerocket-x86_64

@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 6.12.40 Kernel Configuration
+# Linux/x86 6.12.46 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="x86_64-bottlerocket-linux-gnu-gcc (Buildroot 2024.11.1) 13.3.0"
 CONFIG_CC_IS_GCC=y
@@ -124,7 +124,6 @@ CONFIG_BPF_JIT=y
 CONFIG_BPF_JIT_ALWAYS_ON=y
 CONFIG_BPF_JIT_DEFAULT_ON=y
 CONFIG_BPF_UNPRIV_DEFAULT_OFF=y
-CONFIG_USERMODE_DRIVER=y
 CONFIG_BPF_PRELOAD=y
 CONFIG_BPF_PRELOAD_UMD=m
 CONFIG_BPF_LSM=y
@@ -4350,6 +4349,7 @@ CONFIG_VHOST_NET=m
 # CONFIG_VHOST_SCSI is not set
 CONFIG_VHOST_VSOCK=m
 # CONFIG_VHOST_CROSS_ENDIAN_LEGACY is not set
+CONFIG_VHOST_ENABLE_FORK_OWNER_CONTROL=y
 
 #
 # Microsoft Hyper-V guest support

packages/kernel-6.12/kernel-6.12.spec

@@ -4,13 +4,13 @@
 %global kmajor 6.12
 
 Name: %{_cross_os}kernel-%{kmajor}
-Version: 6.12.40
+Version: 6.12.46
 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/d9f128189bb87083f93221463a88c2b9051e274502707f2eb0de8fa461646e2d/kernel6.12-6.12.40-64.114.amzn2023.src.rpm
+Source0: https://cdn.amazonlinux.com/al2023/blobstore/90e970acea5d658008c0707a6c4953b0e877f85b122cd967525bfecb043af96b/kernel6.12-6.12.46-66.121.amzn2023.src.rpm
 Source1: gpgkey-B21C50FA44A99720EAA72F7FE951904AD832C631.asc
 # Use latest-neuron-srpm-url.sh to get this.
 Source2: https://yum.repos.neuron.amazonaws.com/aws-neuronx-dkms-2.21.37.0.noarch.rpm