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

[Stephen Rothwell]

Hi all,

Today's linux-next merge of the modules tree got a conflict in:

  kernel/module/main.c

between commit:

  98d8a9b5e17d ("kbuild: link symbol CRCs at final link, removing CONFIG_MODULE_REL_CRCS")

from the kbuild tree and commit:

  47889798da43 ("module: Move version support into a separate file")

from the modules tree.

I fixed it up (I used the latter version of this file and applied the
following 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@xxxxxxxxxxxxxxxx>
Date: Mon, 23 May 2022 12:04:00 +1000
Subject: [PATCH] fix up for "module: Move version support into a separate file"

interacting with "kbuild: link symbol CRCs at final link, removing CONFIG_MODULE_REL_CRCS"

Signed-off-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
---
 kernel/module/version.c | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/kernel/module/version.c b/kernel/module/version.c
index adaedce1dc97..53f43ac5a73e 100644
--- a/kernel/module/version.c
+++ b/kernel/module/version.c
@@ -10,11 +10,6 @@
 #include <linux/printk.h>
 #include "internal.h"
 
-static u32 resolve_rel_crc(const s32 *crc)
-{
-	return *(u32 *)((void *)crc + *crc);
-}
-
 int check_version(const struct load_info *info,
 		  const char *symname,
 			 struct module *mod,
@@ -43,10 +38,7 @@ int check_version(const struct load_info *info,
 		if (strcmp(versions[i].name, symname) != 0)
 			continue;
 
-		if (IS_ENABLED(CONFIG_MODULE_REL_CRCS))
-			crcval = resolve_rel_crc(crc);
-		else
-			crcval = *crc;
+		crcval = *crc;
 		if (versions[i].crc == crcval)
 			return 1;
 		pr_debug("Found checksum %X vs module %lX\n",
-- 
2.35.1

-- 
Cheers,
Stephen Rothwell

Attachment: pgpXv9ETa6FoR.pgp
Description: OpenPGP digital signature