[ Sasha's backport helper bot ]
Hi,
✅ All tests passed successfully. No issues detected. No action required from the submitter.
The upstream commit SHA1 provided is correct: 05a2b0011c4b6cbbc9b577f6abebe4e9333b0cf6
WARNING: Author mismatch between patch and upstream commit: Backport author: Miguel Ojedaojeda@kernel.org Commit author: Lukas Fischerkernel@o1oo11oo.de
Note: The patch differs from the upstream commit: --- 1: 05a2b0011c4b6 ! 1: 5869631cf792b scripts: generate_rust_analyzer: Add ffi crate @@ Metadata ## Commit message ## scripts: generate_rust_analyzer: Add ffi crate
+ commit 05a2b0011c4b6cbbc9b577f6abebe4e9333b0cf6 upstream. + Commit d072acda4862 ("rust: use custom FFI integer types") did not update rust-analyzer to include the new crate.
@@ Commit message Cc: stable@vger.kernel.org Link: https://lore.kernel.org/r/20250404125150.85783-2-kernel@o1oo11oo.de Signed-off-by: Miguel Ojeda ojeda@kernel.org + [ Fixed conflicts. - Miguel ] + Signed-off-by: Miguel Ojeda ojeda@kernel.org
## scripts/generate_rust_analyzer.py ## @@ scripts/generate_rust_analyzer.py: def generate_crates(srctree, objtree, sysroot_src, external_src, cfgs): - cfg=["kernel"], + ["core", "compiler_builtins"], )
+ append_crate( @@ scripts/generate_rust_analyzer.py: def generate_crates(srctree, objtree, sysroot
- append_crate_with_generated("bindings", ["core"]) - append_crate_with_generated("uapi", ["core"]) -- append_crate_with_generated("kernel", ["core", "macros", "build_error", "pin_init", "bindings", "uapi"]) +- append_crate_with_generated("kernel", ["core", "macros", "build_error", "bindings", "uapi"]) + append_crate_with_generated("bindings", ["core", "ffi"]) + append_crate_with_generated("uapi", ["core", "ffi"]) -+ append_crate_with_generated("kernel", ["core", "macros", "build_error", "pin_init", "ffi", "bindings", "uapi"]) ++ append_crate_with_generated("kernel", ["core", "macros", "build_error", "ffi", "bindings", "uapi"])
def is_root_crate(build_file, target): try: ---
Results of testing on various branches:
| Branch | Patch Apply | Build Test | |---------------------------|-------------|------------| | stable/linux-6.14.y | Success | Success |