diff mbox series

linux-next: manual merge of the modules tree with the kbuild tree

Message ID 20231004114354.39a71ab3@canb.auug.org.au
State New
Headers
Series linux-next: manual merge of the modules tree with the kbuild tree |

Commit Message

Stephen Rothwell Oct. 4, 2023, 12:43 a.m. UTC 
  Hi all,

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(-)

Comments

Stephen Rothwell Nov. 2, 2023, 10:24 p.m. UTC | #1 
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.
diff mbox series

Patch

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);
 }