[ Sasha's backport helper bot ]
Hi,
Summary of potential issues: ⚠️ Found matching upstream commit but patch is missing proper reference to it
Found matching upstream commit: 211dcf77856db64c73e0c3b9ce0c624ec855daca
Status in newer kernel trees: 6.14.y | Not found
Note: The patch differs from the upstream commit: --- 1: 211dcf77856db ! 1: 72f32deb26fb4 rust: clean Rust 1.88.0's `clippy::uninlined_format_args` lint @@ Commit message Reviewed-by: Alice Ryhl aliceryhl@google.com Link: https://lore.kernel.org/r/20250502140237.1659624-6-ojeda@kernel.org Signed-off-by: Miguel Ojeda ojeda@kernel.org - - ## drivers/gpu/nova-core/gpu.rs ## -@@ drivers/gpu/nova-core/gpu.rs: pub(crate) fn arch(&self) -> Architecture { - // For now, redirect to fmt::Debug for convenience. - impl fmt::Display for Chipset { - fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { -- write!(f, "{:?}", self) -+ write!(f, "{self:?}") - } - } - + (cherry picked from commit 211dcf77856db64c73e0c3b9ce0c624ec855daca) + Signed-off-by: Miguel Ojeda ojeda@kernel.org
## rust/kernel/str.rs ## @@ rust/kernel/str.rs: fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { @@ rust/kernel/str.rs: fn test_cstr_display_all_bytes() { }
- ## rust/macros/kunit.rs ## -@@ rust/macros/kunit.rs: pub(crate) fn kunit_tests(attr: TokenStream, ts: TokenStream) -> TokenStream { - } - - if attr.len() > 255 { -- panic!( -- "The test suite name `{}` exceeds the maximum length of 255 bytes", -- attr -- ) -+ panic!("The test suite name `{attr}` exceeds the maximum length of 255 bytes") - } - - let mut tokens: Vec<_> = ts.into_iter().collect(); -@@ rust/macros/kunit.rs: pub(crate) fn kunit_tests(attr: TokenStream, ts: TokenStream) -> TokenStream { - let mut kunit_macros = "".to_owned(); - let mut test_cases = "".to_owned(); - for test in &tests { -- let kunit_wrapper_fn_name = format!("kunit_rust_wrapper_{}", test); -+ let kunit_wrapper_fn_name = format!("kunit_rust_wrapper_{test}"); - let kunit_wrapper = format!( -- "unsafe extern "C" fn {}(_test: *mut kernel::bindings::kunit) {{ {}(); }}", -- kunit_wrapper_fn_name, test -+ "unsafe extern "C" fn {kunit_wrapper_fn_name}(_test: *mut kernel::bindings::kunit) {{ {test}(); }}" - ); - writeln!(kunit_macros, "{kunit_wrapper}").unwrap(); - writeln!( - test_cases, -- " kernel::kunit::kunit_case(kernel::c_str!("{}"), {}),", -- test, kunit_wrapper_fn_name -+ " kernel::kunit::kunit_case(kernel::c_str!("{test}"), {kunit_wrapper_fn_name})," - ) - .unwrap(); - } - ## rust/macros/module.rs ## @@ rust/macros/module.rs: fn emit_base(&mut self, field: &str, content: &str, builtin: bool) { ) @@ rust/macros/module.rs: fn parse(it: &mut token_stream::IntoIter) -> Self {
info
- ## rust/macros/paste.rs ## -@@ rust/macros/paste.rs: fn concat_helper(tokens: &[TokenTree]) -> Vec<(String, Span)> { - let tokens = group.stream().into_iter().collect::<Vec<TokenTree>>(); - segments.append(&mut concat_helper(tokens.as_slice())); - } -- token => panic!("unexpected token in paste segments: {:?}", token), -+ token => panic!("unexpected token in paste segments: {token:?}"), - }; - } - - - ## rust/pin-init/internal/src/pinned_drop.rs ## -@@ rust/pin-init/internal/src/pinned_drop.rs: pub(crate) fn pinned_drop(_args: TokenStream, input: TokenStream) -> TokenStream + ## rust/macros/pinned_drop.rs ## +@@ rust/macros/pinned_drop.rs: pub(crate) fn pinned_drop(_args: TokenStream, input: TokenStream) -> TokenStream // Found the end of the generics, this should be `PinnedDrop`. assert!( matches!(tt, TokenTree::Ident(i) if i.to_string() == "PinnedDrop"), ---
Results of testing on various branches:
| Branch | Patch Apply | Build Test | |---------------------------|-------------|------------| | stable/linux-6.12.y | Success | Success |