From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Masahiro Yamada <masahiroy@kernel•org>
Cc: Luis Chamberlain <mcgrof@kernel•org>,
Petr Pavlu <petr.pavlu@suse•com>,
Sami Tolvanen <samitolvanen@google•com>,
Daniel Gomez <da.gomez@samsung•com>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>
Subject: Re: linux-next: manual merge of the modules tree with the kbuild tree
Date: Mon, 4 Aug 2025 11:24:04 +1000 [thread overview]
Message-ID: <20250804112404.6c6e1565@canb.auug.org.au> (raw)
In-Reply-To: <20250801132941.6815d93d@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 1723 bytes --]
Hi all,
On Fri, 1 Aug 2025 13:29:41 +1000 Stephen Rothwell <sfr@canb•auug.org.au> wrote:
>
> Today's linux-next merge of the modules tree got a conflict in:
>
> include/linux/moduleparam.h
>
> between commit:
>
> 7934a8dd8692 ("module: remove meaningless 'name' parameter from __MODULE_INFO()")
>
> from the kbuild tree and commit:
>
> 40a826bd6c82 ("module: Rename MAX_PARAM_PREFIX_LEN to __MODULE_NAME_LEN")
>
> from the modules tree.
>
> 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.
>
> diff --cc include/linux/moduleparam.h
> index 00166f747e27,a04a2bc4f51e..000000000000
> --- a/include/linux/moduleparam.h
> +++ b/include/linux/moduleparam.h
> @@@ -17,12 -24,8 +24,9 @@@
> #define __MODULE_INFO_PREFIX KBUILD_MODNAME "."
> #endif
>
> - /* Chosen so that structs with an unsigned long line up. */
> - #define MAX_PARAM_PREFIX_LEN (64 - sizeof(unsigned long))
> -
> -#define __MODULE_INFO(tag, name, info) \
> - static const char __UNIQUE_ID(name)[] \
> +/* Generic info of form tag = "info" */
> +#define MODULE_INFO(tag, info) \
> + static const char __UNIQUE_ID(modinfo)[] \
> __used __section(".modinfo") __aligned(1) \
> = __MODULE_INFO_PREFIX __stringify(tag) "=" info
>
This is now a conflict between the kbuild tree and Linus' tree.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next prev parent reply other threads:[~2025-08-04 1:24 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-08-01 3:29 linux-next: manual merge of the modules tree with the kbuild tree Stephen Rothwell
2025-08-04 1:24 ` Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2023-10-04 0:43 Stephen Rothwell
2023-11-02 22:24 ` Stephen Rothwell
2022-05-23 2:08 Stephen Rothwell
2019-09-15 22:05 Mark Brown
2015-11-01 8:31 Stephen Rothwell
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=20250804112404.6c6e1565@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=da.gomez@samsung$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=masahiroy@kernel$(echo .)org \
--cc=mcgrof@kernel$(echo .)org \
--cc=petr.pavlu@suse$(echo .)com \
--cc=samitolvanen@google$(echo .)com \
/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