Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) client-ip=2620:137:e000::3:7;
Date:   Wed, 4 Oct 2023 11:43:54 +1100
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Luis Chamberlain <mcgrof@kernel.org>,
        Masahiro Yamada <masahiroy@kernel.org>
Cc:     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: linux-next: manual merge of the modules tree with the kbuild tree
Message-ID: <20231004114354.39a71ab3@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/oH1/TL=DeD9tVNWwk++UQXc";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

--Sig_/oH1/TL=DeD9tVNWwk++UQXc
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

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 sear=
ch")

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 sear=
ch")

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 =3D elf->strtab + sym->st_name;
=20
 	if (!name || !strlen(name))
-		return 0;
+		return false;
 	return !is_mapping_symbol(name);
 }
=20
--=20
2.40.1

--=20
Cheers,
Stephen Rothwell

--Sig_/oH1/TL=DeD9tVNWwk++UQXc
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

-----BEGIN PGP SIGNATURE-----

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmUctUoACgkQAVBC80lX
0Gx2Pwf9FTvYCFWISG4yvSKQy0vGAxJGeWoybTOEEUj7DwO5hZC/1BepWpNbUJOt
9nD/cPQVLz/S3FJsg0oUWbzm+TjXt9TZVJTuLgdYdlOIVTNutb18mDPV0726LOSm
neHlF9U3+TPJhc8+LRNW0nlQAwvrGsSx3TLk5NKXOtKKjGiYv2h22LYFh2B2haVd
4lcjFl24TNBYvsdeGzdkzWwY6aFbanLy7j53LCaA17DGAO/mPhVuBrKvMJTUeZpC
5whnT7oEU5thhQpFKX8ov6orAOixGWWD/NaNcS8PPyjAd4uMe5kXXzd+nqqZ7lMa
15b2FN8YE09Ag4DM6snQ48ZcRZ+7Jw==
=yr7x
-----END PGP SIGNATURE-----

--Sig_/oH1/TL=DeD9tVNWwk++UQXc--