Re: linux-next: manual merge of the kvm-arm tree with the arm64 tree
Will Deacon <[email protected]>
| Newsgroups | org.kernel.vger.linux-next,org.kernel.vger.linux-kernel |
|---|---|
| Message-ID | <annuJS8ylmqN1r7i@willie-the-truck> |
On Fri, Aug 07, 2026 at 03:42:28PM +0100, Mark Brown wrote:
> Hi all,
>
> Today's linux-next merge of the kvm-arm tree got a conflict in:
>
> arch/arm64/tools/cpucaps
>
> between commits:
>
> 94104e3cfa803 ("arm64: cpufeature: Rename BBML2_NOABORT as BBML3")
> 12aab25ca56ee ("arm64: errata: work around NVIDIA Olympus device store/load ordering")
>
> from the arm64 tree and commits:
>
> 27a263e1a0fa2 ("KVM: arm64: Move GICv3 broken SEIS implementation detection to a CPU errrata")
> 0dbb49dcdbbe9 ("arm64: Add ARM64_HAS_NV2P1 capability")
> 5be1b8de27dce ("arm64: Add ARM64_HAS_NV3 capability")
>
> from the kvm-arm tree. (Only the arm64 tree touches this file one of
> the other commits says!)
Heh, well it usually does! kvm-arm sits pretty close by, though, and
the attempt at alphabetical sorting didn't help us here.
Anyway, thanks -- the merge in -next looks good.
Will