From d8b52655f6a8b62113ecbaf8faf493c2a7f3fb36 Mon Sep 17 00:00:00 2001 From: Antoni Boucher Date: Sat, 31 Jan 2026 11:10:52 -0500 Subject: [PATCH 1/3] Remove patch not needed anymore --- .github/workflows/ci.yaml | 3 --- ...se-inline-always-for-bit_T-functions.patch | 25 ------------------- 2 files changed, 28 deletions(-) delete mode 100644 patches/0001-Use-inline-always-for-bit_T-functions.patch diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 7722ec0..4562f56 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -93,9 +93,6 @@ jobs: # TODO: remove if this patch is indeed not necessary. (It seems the patch is now included upstream.) # - 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/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 diff --git a/patches/0001-Use-inline-always-for-bit_T-functions.patch b/patches/0001-Use-inline-always-for-bit_T-functions.patch deleted file mode 100644 index 5d62e0b..0000000 --- a/patches/0001-Use-inline-always-for-bit_T-functions.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 826b2b4116d7d204132a2ec1afd2fcb57061994c Mon Sep 17 00:00:00 2001 -From: Antoni Boucher -Date: Fri, 5 Dec 2025 07:51:25 -0500 -Subject: [PATCH] Use #[inline(always)] for bit_T functions - ---- - rust/kernel/bits.rs | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/rust/kernel/bits.rs b/rust/kernel/bits.rs -index 553d50265883..d39aed20bc6f 100644 ---- a/rust/kernel/bits.rs -+++ b/rust/kernel/bits.rs -@@ -27,7 +27,7 @@ pub fn [](n: u32) -> Option<$ty> { - /// - /// This version is the default and should be used if `n` is known at - /// compile time. -- #[inline] -+ #[inline(always)] - pub const fn [](n: u32) -> $ty { - build_assert!(n < <$ty>::BITS); - (1 as $ty) << n --- -2.52.0 - From 594ed5f7b1c889471891381b6957b9dae780443c Mon Sep 17 00:00:00 2001 From: Antoni Boucher Date: Sat, 31 Jan 2026 11:16:33 -0500 Subject: [PATCH 2/3] Remove patch not needed anymore --- .github/workflows/ci.yaml | 3 --- patches/0001-Skip-GCC-flag-for-bindgen.patch | 26 -------------------- 2 files changed, 29 deletions(-) delete mode 100644 patches/0001-Skip-GCC-flag-for-bindgen.patch diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 4562f56..06bddca 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -93,9 +93,6 @@ jobs: # TODO: remove if this patch is indeed not necessary. (It seems the patch is now included upstream.) # - 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/patches/0001-Skip-GCC-flag-for-bindgen.patch - # TODO: remove when fixed in the above branch. - run: git -C linux apply ../ci/patches/0001-Ignore-some-failing-tests.patch diff --git a/patches/0001-Skip-GCC-flag-for-bindgen.patch b/patches/0001-Skip-GCC-flag-for-bindgen.patch deleted file mode 100644 index 3026eda..0000000 --- a/patches/0001-Skip-GCC-flag-for-bindgen.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 669e0e3d10ce44a257cd53bff6b84aa8a7ee847c Mon Sep 17 00:00:00 2001 -From: Antoni Boucher -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 - From 73cdc5980129ebe4d3020906b6cee907ea447f42 Mon Sep 17 00:00:00 2001 From: Antoni Boucher Date: Sat, 31 Jan 2026 11:37:11 -0500 Subject: [PATCH 3/3] Remove patch not needed anymore --- .github/workflows/ci.yaml | 3 -- patches/0001-Ignore-some-failing-tests.patch | 34 -------------------- 2 files changed, 37 deletions(-) delete mode 100644 patches/0001-Ignore-some-failing-tests.patch diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 06bddca..d9d49f1 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -93,9 +93,6 @@ jobs: # TODO: remove if this patch is indeed not necessary. (It seems the patch is now included upstream.) # - 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/patches/0001-Ignore-some-failing-tests.patch - # Setup: `busybox`. - run: | git clone --depth 1 -b 1_30_1 https://git.busybox.net/busybox/ diff --git a/patches/0001-Ignore-some-failing-tests.patch b/patches/0001-Ignore-some-failing-tests.patch deleted file mode 100644 index 1fff8f3..0000000 --- a/patches/0001-Ignore-some-failing-tests.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 9a6c9860dacb8f337cf968d27a43a05788db5eeb Mon Sep 17 00:00:00 2001 -From: Antoni Boucher -Date: Sun, 21 Dec 2025 10:44:08 -0500 -Subject: [PATCH] Ignore some failing tests - ---- - rust/macros/lib.rs | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/rust/macros/lib.rs b/rust/macros/lib.rs -index b38002151871..8b2af1dc79d0 100644 ---- a/rust/macros/lib.rs -+++ b/rust/macros/lib.rs -@@ -59,7 +59,7 @@ - /// - /// # Examples - /// --/// ``` -+/// ```ignore - /// use kernel::prelude::*; - /// - /// module!{ -@@ -99,7 +99,7 @@ - /// build an initramfs uses this information to put the firmware files into - /// the initramfs image. - /// --/// ``` -+/// ```ignore - /// use kernel::prelude::*; - /// - /// module!{ --- -2.52.0 -