Re: linux-next: manual merge of the arm64 tree with the origin tree
From: Mark Brown
Date: Mon Jan 26 2026 - 11:09:08 EST
On Mon, Jan 26, 2026 at 03:23:32PM +0000, Will Deacon wrote:
> On Mon, Jan 26, 2026 at 03:11:27PM +0000, Mark Brown wrote:
> > [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.
Indeed - there's updates needed elsewhere.
> 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?
I guess you could also merge up -rc7 given that this is in Linus' tree?
Attachment:
signature.asc
Description: PGP signature