From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Masahiro Yamada <masahiroy@kernel•org>
Cc: Luis Chamberlain <mcgrof@kernel•org>,
Jack Brennen <jbrennen@google•com>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
Tiezhu Yang <yangtiezhu@loongson•cn>
Subject: Re: linux-next: manual merge of the modules tree with the kbuild tree
Date: Fri, 3 Nov 2023 09:24:19 +1100 [thread overview]
Message-ID: <20231103092419.5eb5fcdd@canb.auug.org.au> (raw)
In-Reply-To: <20231004114354.39a71ab3@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 2157 bytes --]
Hi all,
On Wed, 4 Oct 2023 11:43:54 +1100 Stephen Rothwell <sfr@canb•auug.org.au> wrote:
>
> Today's linux-next merge of the modules tree got a conflict in:
>
> scripts/mod/modpost.c
>
> between commit:
>
> 4074532758c5 ("modpost: Optimize symbol search from linear to binary search")
>
> from the kbuild tree and commit:
>
> dc95e422c283 ("module: Make is_valid_name() return bool")
>
> from the modules tree.
>
> I fixed it up (I used the former version of this files and applied the
> following merge resolution patch) 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.
>
> From: Stephen Rothwell <sfr@canb•auug.org.au>
> Date: Wed, 4 Oct 2023 11:39:03 +1100
> Subject: [PATCH] fix up for "module: Make is_valid_name() return bool"
>
> interacting with commit
>
> 4074532758c5 ("modpost: Optimize symbol search from linear to binary search")
>
> from the kbuild tree.
>
> Signed-off-by: Stephen Rothwell <sfr@canb•auug.org.au>
> ---
> scripts/mod/modpost.h | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/scripts/mod/modpost.h b/scripts/mod/modpost.h
> index 6413f26fcb6b..5a0324f3257f 100644
> --- a/scripts/mod/modpost.h
> +++ b/scripts/mod/modpost.h
> @@ -163,12 +163,12 @@ static inline unsigned int get_secindex(const struct elf_info *info,
> *
> * Internal symbols created by tools should be ignored by modpost.
> */
> -static inline int is_valid_name(struct elf_info *elf, Elf_Sym *sym)
> +static inline bool is_valid_name(struct elf_info *elf, Elf_Sym *sym)
> {
> const char *name = elf->strtab + sym->st_name;
>
> if (!name || !strlen(name))
> - return 0;
> + return false;
> return !is_mapping_symbol(name);
> }
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:[~2023-11-02 22:24 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-10-04 0:43 linux-next: manual merge of the modules tree with the kbuild tree Stephen Rothwell
2023-11-02 22:24 ` Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2025-08-01 3:29 Stephen Rothwell
2025-08-04 1: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=20231103092419.5eb5fcdd@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=jbrennen@google$(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=yangtiezhu@loongson$(echo .)cn \
/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