On Mon, Apr 29, 2024 at 1:21 PM <gregkh@xxxxxxxxxxxxxxxxxxx> wrote:
>
> Possible dependencies:
>
> 7044dcff8301 ("rust: macros: fix soundness issue in `module!` macro")
> 1b6170ff7a20 ("rust: module: place generated init_module() function in .init.text")
> 41bdc6decda0 ("btf, scripts: rust: drop is_rust_module.sh")
For 6.1, it is a bit more complex. The following sequence applies cleanly:
git cherry-pick 46384d0990bf99ed8b597e8794ea581e2a647710
git cherry-pick ccc4505454db10402d5284f22d8b7db62e636fc5
git cherry-pick 41bdc6decda074afc4d8f8ba44c69b08d0e9aff6
git cherry-pick 1b6170ff7a203a5e8354f19b7839fe8b897a9c0d
git cherry-pick 7044dcff8301b29269016ebd17df27c4736140d2
i.e.
46384d0990bf ("rust: error: Rename to_kernel_errno() -> to_errno()")
ccc4505454db ("rust: fix regexp in scripts/is_rust_module.sh")
41bdc6decda0 ("btf, scripts: rust: drop is_rust_module.sh")
1b6170ff7a20 ("rust: module: place generated init_module() function in
.init.text")
7044dcff8301 ("rust: macros: fix soundness issue in `module!` macro")
So essentially 2 more commits needed than the dependencies quoted
above: the rename (which is easy) and the regexp change so that the
drop applies cleanly (which makes the regexp change a no-op). This
seems easier/cleaner than crafting a custom commit for that.
I think dropping the script is OK, since it was already redundant from
what we discussed last time [1], but I am Cc'ing Andrea and Daniel so
that they are aware and in case I may be missing something (note that
6.1 LTS already has commit c1177979af9c ("btf, scripts: Exclude Rust
CUs with pahole")).
Thanks!
Cheers,
Miguel
[1] https://lore.kernel.org/rust-for-linux/CANiq72k6um58AAydgkzhkmAdd8t1quzeGaPsR7-pS_ZXYf0-YQ@xxxxxxxxxxxxxx/
