From: "Lorenzo Stoakes (ARM)" <ljs@kernel.org>
To: Mark Brown <broonie@kernel.org>
Cc: Nathan Chancellor <nathan@kernel.org>,
Nicolas Schier <nsc@kernel.org>,
KBuild Mailing List <linux-kbuild@vger.kernel.org>,
Andrew Morton <akpm@linux-foundation.org>,
Jim Cromie <jim.cromie@gmail.com>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: Re: linux-next: manual merge of the kbuild tree with the mm-nonmm-unstable tree
Date: Wed, 30 Sep 2026 13:23:59 +0100 [thread overview]
Message-ID: <arz_Mkk0n5UqP8lW@gremlin> (raw)
In-Reply-To: <arz2wQWcnS9499di@sirena.org.uk>
On Wed, Sep 30, 2026 at 12:47:13PM +0100, Mark Brown wrote:
> Hi all,
>
> Today's linux-next merge of the kbuild tree got a conflict in:
>
> scripts/kallsyms.c
>
> between commit:
>
> edd7005a42d42 ("kallsyms: increase marker density to 16:1 to accelerate lookups")
>
> from the mm-nonmm-unstable tree and commit:
>
> 531980b4b17e9 ("kallsyms: reimplement mksysmap in C")
>
> from the kbuild tree.
>
> I fixed it up (see below) 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.
Looks correct to me, thanks!
--
Cheers, Lorenzo
prev parent reply other threads:[~2026-09-30 12:24 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-09-30 11:47 Mark Brown
2026-09-30 12:23 ` Lorenzo Stoakes (ARM) [this message]
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=arz_Mkk0n5UqP8lW@gremlin \
--to=ljs@kernel.org \
--cc=akpm@linux-foundation.org \
--cc=broonie@kernel.org \
--cc=jim.cromie@gmail.com \
--cc=linux-kbuild@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=nathan@kernel.org \
--cc=nsc@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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
all inboxes | Powered by JetHome®