FAILED: patch "[PATCH] rust: remove `params` from `module` macro example" failed to apply to 6.1-stable tree
Subsystems (2)
[email protected]
maintainerThe patch below does not apply to the 6.1-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.
To reproduce the conflict and resubmit, you may use the following commands:
git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.1.y
git checkout FETCH_HEAD
git cherry-pick -x 19843452dca40e28d6d3f4793d998b681d505c7f
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<[email protected]>' --in-reply-to '2024042924-ribcage-browsing-7e8b@gregkh' --subject-prefix 'PATCH 6.1.y' HEAD^..
Possible dependencies:
19843452dca4 ("rust: remove params from module macro example") b13c9880f909 ("rust: macros: take string literals in module!") c3630df66f95 ("rust: samples: add rust_print example")
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From 19843452dca40e28d6d3f4793d998b681d505c7f Mon Sep 17 00:00:00 2001
From: Aswin Unnikrishnan <[email protected]>
Date: Fri, 19 Apr 2024 21:50:13 +0000
Subject: [PATCH] rust: remove params from module macro example
Remove argument params from the module macro example, because the macro does not currently support module parameters since it was not sent with the initial merge.
rust/macros/lib.rs +0 -12
@@ -35,18 +35,6 @@ use proc_macro::TokenStream;/// author: "Rust for Linux Contributors", /// description: "My very own kernel module!", /// license: "GPL", -/// params: { -/// my_i32: i32 { -/// default: 42, -/// permissions: 0o000, -/// description: "Example of i32", -/// }, -/// writeable_i32: i32 { -/// default: 42, -/// permissions: 0o644, -/// description: "Example of i32", -/// }, -/// }, /// } /// /// struct MyModule;
Miguel Ojeda
maintainerPATCH 1/1 rust: remove `params` from `module` macro example
From: Aswin Unnikrishnan <[email protected]>
Remove argument params from the module macro example, because the macro does not currently support module parameters since it was not sent with the initial merge.
--- rust/macros/lib.rs | 12 ------------ 1 file changed, 12 deletions(-)
rust/macros/lib.rs +0 -12
@@ -27,18 +27,6 @@ use proc_macro::TokenStream;/// author: b"Rust for Linux Contributors", /// description: b"My very own kernel module!", /// license: b"GPL", -/// params: { -/// my_i32: i32 { -/// default: 42, -/// permissions: 0o000, -/// description: b"Example of i32", -/// }, -/// writeable_i32: i32 { -/// default: 42, -/// permissions: 0o644, -/// description: b"Example of i32", -/// }, -/// }, /// } /// /// struct MyModule;
Signature · 1 line
2.44.0
Re: [PATCH 6.1.y] rust: remove `params` from `module` macro example
Quoted 15 lines · Miguel Ojeda
From: Aswin Unnikrishnan <[email protected]>
Remove argument
paramsfrom themodulemacro example, because the macro does not currently support module parameters since it was not sent with the initial merge.Signed-off-by Aswin Unnikrishnan <[email protected]>Reviewed-by Alice Ryhl <[email protected]>Fixes 1fbde52bde73 ("rust: add `macros` crate")[ Reworded slightly. ]Signed-off-by Miguel Ojeda <[email protected]>(cherry picked from commit 19843452dca40e28d6d3f4793d998b681d505c7f)Signed-off-by Miguel Ojeda <[email protected]>
Quoted 3 lines
--- rust/macros/lib.rs | 12 ------------ 1 file changed, 12 deletions(-)
Now queued up, thanks.
greg k-h