From: Stephen Rothwell <sfr@canb•auug.org.au>
To: "Uwe Kleine-König" <ukleinek@kernel•org>,
"Luis Chamberlain" <mcgrof@kernel•org>,
"Daniel Gomez" <da.gomez@samsung•com>,
"Sami Tolvanen" <samitolvanen@google•com>,
"Petr Pavlu" <petr.pavlu@suse•com>
Cc: Andreas Hindborg <a.hindborg@kernel•org>,
Daniel Gomez <da.gomez@kernel•org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
Michal Wilczynski <m.wilczynski@samsung•com>
Subject: Re: linux-next: manual merge of the pwm tree with the modules tree
Date: Tue, 4 Nov 2025 10:54:15 +1100 [thread overview]
Message-ID: <20251104105415.68bfb090@canb.auug.org.au> (raw)
In-Reply-To: <20251104104827.1de36ea0@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 5634 bytes --]
Hi all,
[adding the modules tree contacts]
On Tue, 4 Nov 2025 10:48:27 +1100 Stephen Rothwell <sfr@canb•auug.org.au> 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!")
>
> from the pwm tree.
>
> I followed a supplied resolution from Uwe and Danieli, thanks. Though I
> am just wondering (fromfollowing the pattern) if the "&ns" on line 545
> should be "ns" - though I guess it would fail to build if so?
>
> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging. You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.
>
> --
> Cheers,
> Stephen Rothwell
>
> diff --cc rust/macros/module.rs
> index d62e9c1e2a89,408cd1154875..000000000000
> --- a/rust/macros/module.rs
> +++ b/rust/macros/module.rs
> @@@ -205,50 -98,7 +205,51 @@@ struct ModuleInfo
> description: Option<String>,
> alias: Option<Vec<String>>,
> firmware: Option<Vec<String>>,
> + imports_ns: Option<Vec<String>>,
> + params: Option<Vec<Parameter>>,
> +}
> +
> +#[derive(Debug)]
> +struct Parameter {
> + name: String,
> + ptype: String,
> + default: String,
> + description: String,
> +}
> +
> +fn expect_params(it: &mut token_stream::IntoIter) -> Vec<Parameter> {
> + let params = expect_group(it);
> + assert_eq!(params.delimiter(), Delimiter::Brace);
> + let mut it = params.stream().into_iter();
> + let mut parsed = Vec::new();
> +
> + loop {
> + let param_name = match it.next() {
> + Some(TokenTree::Ident(ident)) => ident.to_string(),
> + Some(_) => panic!("Expected Ident or end"),
> + None => break,
> + };
> +
> + assert_eq!(expect_punct(&mut it), ':');
> + let param_type = expect_ident(&mut it);
> + let group = expect_group(&mut it);
> + assert_eq!(group.delimiter(), Delimiter::Brace);
> + assert_eq!(expect_punct(&mut it), ',');
> +
> + let mut param_it = group.stream().into_iter();
> + let param_default = expect_param_default(&mut param_it);
> + let param_description = expect_string_field(&mut param_it, "description");
> + expect_end(&mut param_it);
> +
> + parsed.push(Parameter {
> + name: param_name,
> + ptype: param_type,
> + default: param_default,
> + description: param_description,
> + })
> + }
> +
> + parsed
> }
>
> impl ModuleInfo {
> @@@ -263,7 -113,7 +264,8 @@@
> "license",
> "alias",
> "firmware",
> + "imports_ns",
> + "params",
> ];
> const REQUIRED_KEYS: &[&str] = &["type", "name", "license"];
> let mut seen_keys = Vec::new();
> @@@ -289,7 -139,7 +291,8 @@@
> "license" => info.license = expect_string_ascii(it),
> "alias" => info.alias = Some(expect_string_array(it)),
> "firmware" => info.firmware = Some(expect_string_array(it)),
> + "imports_ns" => info.imports_ns = Some(expect_string_array(it)),
> + "params" => info.params = Some(expect_params(it)),
> _ => panic!("Unknown key \"{key}\". Valid keys are: {EXPECTED_KEYS:?}."),
> }
>
> @@@ -329,25 -179,30 +332,30 @@@ pub(crate) fn module(ts: TokenStream) -
> // Rust does not allow hyphens in identifiers, use underscore instead.
> let ident = info.name.replace('-', "_");
> let mut modinfo = ModInfoBuilder::new(ident.as_ref());
> - if let Some(authors) = info.authors {
> + if let Some(authors) = &info.authors {
> for author in authors {
> - modinfo.emit("author", &author);
> + modinfo.emit("author", author);
> }
> }
> - if let Some(description) = info.description {
> - modinfo.emit("description", &description);
> + if let Some(description) = &info.description {
> + modinfo.emit("description", description);
> }
> modinfo.emit("license", &info.license);
> - if let Some(aliases) = info.alias {
> + if let Some(aliases) = &info.alias {
> for alias in aliases {
> - modinfo.emit("alias", &alias);
> + modinfo.emit("alias", alias);
> }
> }
> - if let Some(firmware) = info.firmware {
> + if let Some(firmware) = &info.firmware {
> for fw in firmware {
> - modinfo.emit("firmware", &fw);
> + modinfo.emit("firmware", fw);
> }
> }
> - if let Some(imports) = info.imports_ns {
> ++ if let Some(imports) = &info.imports_ns {
> + for ns in imports {
> + modinfo.emit("import_ns", &ns);
> + }
> + }
>
> // Built-in modules also export the `file` modinfo string.
> let file =
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next prev parent reply other threads:[~2025-11-03 23:54 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-11-03 23:48 linux-next: manual merge of the pwm tree with the modules tree Stephen Rothwell
2025-11-03 23:54 ` Stephen Rothwell [this message]
2025-11-04 8:48 ` Daniel Gomez
2025-11-04 21:17 ` Stephen Rothwell
2025-11-07 16:44 ` Uwe Kleine-König
2025-11-10 13:59 ` Daniel Gomez
2025-11-10 15:42 ` Uwe Kleine-König
2025-11-10 15:54 ` Daniel Gomez
2025-11-10 18:32 ` Uwe Kleine-König
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20251104105415.68bfb090@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=a.hindborg@kernel$(echo .)org \
--cc=da.gomez@kernel$(echo .)org \
--cc=da.gomez@samsung$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=m.wilczynski@samsung$(echo .)com \
--cc=mcgrof@kernel$(echo .)org \
--cc=petr.pavlu@suse$(echo .)com \
--cc=samitolvanen@google$(echo .)com \
--cc=ukleinek@kernel$(echo .)org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox