From: Will Deacon <will@kernel•org>
To: Mark Brown <broonie@kernel•org>
Cc: Catalin Marinas <catalin.marinas@arm•com>,
Dev Jain <dev.jain@arm•com>, Kees Cook <kees@kernel•org>,
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 arm64 tree with the origin tree
Date: Tue, 23 Sep 2025 09:36:27 +0100 [thread overview]
Message-ID: <aNJcC3aAfJ-gCv6m@willie-the-truck> (raw)
In-Reply-To: <aNJZaJT9elF0TDqH@finisterre.sirena.org.uk>
On Tue, Sep 23, 2025 at 10:25:12AM +0200, Mark Brown wrote:
> Hi all,
>
> Today's linux-next merge of the arm64 tree got a conflict in:
>
> arch/arm64/mm/mmu.c
>
> between commit:
>
> ceca927c86e6f ("arm64: mm: Fix CFI failure due to kpti_ng_pgd_alloc function signature")
>
> from the origin tree and commit:
>
> fa93b45fd397e ("arm64: Enable vmalloc-huge with ptdump")
>
> from the arm64 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.
>
> diff --cc arch/arm64/mm/mmu.c
> index 980d7745a5499,10c2580995814..0000000000000
> --- a/arch/arm64/mm/mmu.c
> +++ b/arch/arm64/mm/mmu.c
> @@@ -47,6 -49,15 +49,8 @@@
> #define NO_CONT_MAPPINGS BIT(1)
> #define NO_EXEC_MAPPINGS BIT(2) /* assumes FEAT_HPDS is not used */
>
> -enum pgtable_type {
> - TABLE_PTE,
> - TABLE_PMD,
> - TABLE_PUD,
> - TABLE_P4D,
> -};
> -
> + DEFINE_STATIC_KEY_FALSE(arm64_ptdump_lock_key);
> +
Thanks, the the correct resolution. I'll merge in for-next/fixes soon
(we have a dangling patch that depends on it) so this will disappear.
Will
next prev parent reply other threads:[~2025-09-23 8:36 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-09-23 8:25 linux-next: manual merge of the arm64 tree with the origin tree Mark Brown
2025-09-23 8:36 ` Will Deacon [this message]
-- strict thread matches above, loose matches on Subject: below --
2026-01-26 15:11 Mark Brown
2026-01-26 15:23 ` Will Deacon
2026-01-26 15:53 ` Marc Zyngier
2026-01-26 16:08 ` Mark Brown
2026-01-26 15:39 ` Marc Zyngier
2026-01-26 22:49 ` Mark Brown
2026-06-04 12:59 Mark Brown
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=aNJcC3aAfJ-gCv6m@willie-the-truck \
--to=will@kernel$(echo .)org \
--cc=broonie@kernel$(echo .)org \
--cc=catalin.marinas@arm$(echo .)com \
--cc=dev.jain@arm$(echo .)com \
--cc=kees@kernel$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.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