Add patch in Kernel 6.12, Prep for release 9.4.1

CHANGELOG.md

@@ -1,3 +1,11 @@
+# v9.4.1 (2026-10-07)
+
+## OS Changes
+
+* Add patch to revert "xarray: honor XA_FLAGS_ACCOUNT in xas_split_alloc()" to Kernel 6.12 ([#584])
+
+[#584]: https://github.com/bottlerocket-os/bottlerocket-kernel-kit/pull/584
+
 # v9.4.0 (2026-10-01)
 
 ## OS Changes

Twoliter.toml

@@ -1,5 +1,5 @@
 schema-version = 2
-release-version = "9.4.0"
+release-version = "9.4.1"
 project-vendor = "Bottlerocket"
 
 [vendor.bottlerocket]

packages/kernel-6.12/1012-Revert-xarray-honor-XA_FLAGS_ACCOUNT-in-xas_split_a.patch

@@ -0,0 +1,29 @@
+From ad812805fea7108d9f8efc240e4810b513b46754 Mon Sep 17 00:00:00 2001
+From: Nathan Gao <zcgao@amazon.com>
+Date: Mon, 5 Oct 2026 22:47:13 +0000
+Subject: [PATCH] Revert "xarray: honor XA_FLAGS_ACCOUNT in xas_split_alloc()"
+
+This reverts commit ad812805fea7108d9f8efc240e4810b513b46754.
+
+Signed-off-by: Nathan Gao <zcgao@amazon.com>
+Signed-off-by: Shikha Vyaghra <vyaghras@amazon.com>
+---
+ lib/xarray.c | 3 ---
+ 1 file changed, 3 deletions(-)
+
+diff --git a/lib/xarray.c b/lib/xarray.c
+--- a/lib/xarray.c
++++ b/lib/xarray.c
+@@ -1027,9 +1027,6 @@ void xas_split_alloc(struct xa_state *xas, void *entry, unsigned int order,
+ 	if (xas->xa_shift + XA_CHUNK_SHIFT > order)
+ 		return;
+
+-	if (xas->xa->xa_flags & XA_FLAGS_ACCOUNT)
+-		gfp |= __GFP_ACCOUNT;
+-
+ 	do {
+ 		unsigned int i;
+ 		void *sibling = NULL;
+-- 
+2.40.0
+

packages/kernel-6.12/kernel-6.12.spec

@@ -81,6 +81,8 @@ Patch1009: 1009-nitro_enclaves-fix-use-after-free-on-SLOT_ALLOC-fail.patch
 Patch1010: 1010-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