Re: linux-next: manual merge of the pwm tree with the modules tree

[Uwe Kleine-König]

Hi Daniel,

On Tue, Nov 04, 2025 at 10:54:15AM +1100, Stephen Rothwell wrote:
> [adding the modules tree contacts]
> 
> On Tue, 4 Nov 2025 10:48:27 +1100 Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
> >
> > Today's linux-next merge of the pwm tree got a conflict in:
> > 
> >   rust/macros/module.rs
> > 
> > between commits:
> > 
> >   3809d7a89fe5 ("rust: module: use a reference in macros::module::module")
> >   0b24f9740f26 ("rust: module: update the module macro with module parameter support")
> > 
> > from the modules tree and commit:
> > 
> >   927687809649 ("rust: macros: Add support for 'imports_ns' to module!")

I reshuffled my tree such that the import_ns commit sits directly on top
of 6.18-rc1. The new commit-id is 739ad9be61e5.

> > from the pwm tree.
> > [...]
> >  -    if let Some(imports) = info.imports_ns {
> > ++    if let Some(imports) = &info.imports_ns {
> > +         for ns in imports {
> > +             modinfo.emit("import_ns", &ns);
> > +         }
> > +     }

Given that the conflict resolution is non-trivial and we already know
what to do, I suggest you merge my commit into the modules tree.

I created a signed tag for that:

The following changes since commit 3a8660878839faadb4f1a6dd72c3179c1df56787:

  Linux 6.18-rc1 (2025-10-12 13:42:36 -0700)

are available in the Git repository at:

  https://git.kernel.org/pub/scm/linux/kernel/git/ukleinek/linux.git tags/rust-module-namespace

for you to fetch changes up to 739ad9be61e5f53dbd8d7d7e80723d0799ff077c:

  rust: macros: Add support for 'imports_ns' to module! (2025-11-07 10:01:53 +0100)

----------------------------------------------------------------
immutable branch containing module namespace support for Rust

----------------------------------------------------------------
Michal Wilczynski (1):
      rust: macros: Add support for 'imports_ns' to module!

 rust/macros/module.rs | 8 ++++++++
 1 file changed, 8 insertions(+)

Thanks
Uwe

Attachment: signature.asc
Description: PGP signature