From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Luis Chamberlain <mcgrof@kernel•org>,
Masahiro Yamada <masahiroy@kernel•org>
Cc: Aaron Tomlin <atomlin@redhat•com>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>
Subject: linux-next: manual merge of the modules tree with the kbuild tree
Date: Mon, 23 May 2022 12:08:59 +1000 [thread overview]
Message-ID: <20220523120859.570f7367@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 2056 bytes --]
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@canb•auug.org.au>
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@canb•auug.org.au>
---
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 #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2022-05-23 2:09 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-05-23 2:08 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
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
2023-10-04 0:43 Stephen Rothwell
2023-11-02 22:24 ` 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=20220523120859.570f7367@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=atomlin@redhat$(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 \
/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