diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index b788242..a7de5af 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -94,7 +94,10 @@ jobs:
       # - run: git -C linux apply ../ci/x86-boot-Use-std-gnu11-to-fix-build-with-GCC-15.patch
 
       # TODO: remove when fixed in the above branch.
-      - run: git -C linux apply ../ci/0001-Use-inline-always-for-bit_T-functions.patch
+      - run: git -C linux apply ../ci/patches/0001-Use-inline-always-for-bit_T-functions.patch
+
+      # TODO: remove when fixed in the above branch.
+      - run: git -C linux apply ../ci/patches/0001-Skip-GCC-flag-for-bindgen.patch
 
       # Setup: `busybox`.
       - run: |
diff --git a/patches/0001-Skip-GCC-flag-for-bindgen.patch b/patches/0001-Skip-GCC-flag-for-bindgen.patch
new file mode 100644
index 0000000..3026eda
--- /dev/null
+++ b/patches/0001-Skip-GCC-flag-for-bindgen.patch
@@ -0,0 +1,26 @@
+From 669e0e3d10ce44a257cd53bff6b84aa8a7ee847c Mon Sep 17 00:00:00 2001
+From: Antoni Boucher <bouanto@zoho.com>
+Date: Tue, 9 Dec 2025 08:13:47 -0500
+Subject: [PATCH] Skip GCC flag for bindgen
+
+---
+ rust/Makefile | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/rust/Makefile b/rust/Makefile
+index 5d357dce1..e077f4515 100644
+--- a/rust/Makefile
++++ b/rust/Makefile
+@@ -383,7 +383,8 @@ bindgen_skip_c_flags := -mno-fp-ret-in-387 -mpreferred-stack-boundary=% \
+ 	-fno-inline-functions-called-once -fsanitize=bounds-strict \
+ 	-fstrict-flex-arrays=% -fmin-function-alignment=% \
+ 	-fzero-init-padding-bits=% -mno-fdpic \
+-	--param=% --param asan-% -fno-isolate-erroneous-paths-dereference
++	--param=% --param asan-% -fno-isolate-erroneous-paths-dereference \
++	-fdiagnostics-show-context=2
+ 
+ # Derived from `scripts/Makefile.clang`.
+ BINDGEN_TARGET_x86	:= x86_64-linux-gnu
+-- 
+2.52.0
+
diff --git a/0001-Use-inline-always-for-bit_T-functions.patch b/patches/0001-Use-inline-always-for-bit_T-functions.patch
similarity index 100%
rename from 0001-Use-inline-always-for-bit_T-functions.patch
rename to patches/0001-Use-inline-always-for-bit_T-functions.patch