From: Will Deacon <will@kernel•org>
To: Mark Brown <broonie@kernel•org>, maz@kernel•org
Cc: Catalin Marinas <catalin.marinas@arm•com>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
Oliver Upton <oupton@kernel•org>,
Paolo Bonzini <pbonzini@redhat•com>
Subject: Re: linux-next: manual merge of the arm64 tree with the origin tree
Date: Mon, 26 Jan 2026 15:23:32 +0000 [thread overview]
Message-ID: <aXeG9FIIP_-hpCHm@willie-the-truck> (raw)
In-Reply-To: <aXeEH-iffNS9VIrA@sirena.org.uk>
On Mon, Jan 26, 2026 at 03:11:27PM +0000, Mark Brown wrote:
> Hi all,
>
> Today's linux-next merge of the arm64 tree got a conflict in:
>
> arch/arm64/kvm/hyp/entry.S
>
> between commit:
>
> 86364832ba6f2 ("KVM: arm64: Don't blindly set set PSTATE.PAN on guest exit")
>
> from the origin tree and commit:
>
> 018a231b0260e ("arm64: Unconditionally enable PAN support")
>
> 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.
>
> [Took the version from Linus' tree.]
Hmm, I suspect that's not quite right because CONFIG_ARM64_PAN doesn't
exist anymore in the arm64 tree and so the hunk in
arch/arm64/kvm/va_layout.c probably needs tweaking.
Marc -- how would you prefer to handle this? I could bring back
CONFIG_ARM64_PAN as a hidden Kconfig option =y and then we could clean
up the stragglers at -rc1?
Will
next prev parent reply other threads:[~2026-01-26 15:23 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-01-26 15:11 linux-next: manual merge of the arm64 tree with the origin tree Mark Brown
2026-01-26 15:23 ` Will Deacon [this message]
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
-- strict thread matches above, loose matches on Subject: below --
2026-06-04 12:59 Mark Brown
2025-09-23 8:25 Mark Brown
2025-09-23 8:36 ` Will Deacon
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=aXeG9FIIP_-hpCHm@willie-the-truck \
--to=will@kernel$(echo .)org \
--cc=broonie@kernel$(echo .)org \
--cc=catalin.marinas@arm$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=maz@kernel$(echo .)org \
--cc=oupton@kernel$(echo .)org \
--cc=pbonzini@redhat$(echo .)com \
/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