[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <20240916164744.3ecf283d@canb.auug.org.au>
Date: Mon, 16 Sep 2024 16:47:44 +1000
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Christoffer Dall <cdall@...columbia.edu>, Marc Zyngier <maz@...nel.org>,
Catalin Marinas <catalin.marinas@....com>, Will Deacon <will@...nel.org>
Cc: Joey Gouly <joey.gouly@....com>, Linux Kernel Mailing List
<linux-kernel@...r.kernel.org>, Linux Next Mailing List
<linux-next@...r.kernel.org>
Subject: Re: linux-next: manual merge of the kvm-arm tree with the arm64
tree
Hi all,
On Thu, 5 Sep 2024 16:08:56 +1000 Stephen Rothwell <sfr@...b.auug.org.au> wrote:
>
> Today's linux-next merge of the kvm-arm tree got a conflict in:
>
> arch/arm64/include/asm/kvm_host.h
>
> between commit:
>
> b86c9bea6349 ("KVM: arm64: Save/restore POE registers")
>
> from the arm64 tree and commits:
>
> b55688943597 ("KVM: arm64: Move SVCR into the sysreg array")
> 7d9c1ed6f4bf ("KVM: arm64: Move FPMR into the sysreg array")
>
> from the kvm-arm 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.
>
> --
> Cheers,
> Stephen Rothwell
>
> diff --cc arch/arm64/include/asm/kvm_host.h
> index d5857452a1ec,b9ca899041db..000000000000
> --- a/arch/arm64/include/asm/kvm_host.h
> +++ b/arch/arm64/include/asm/kvm_host.h
> @@@ -446,8 -446,10 +446,12 @@@ enum vcpu_sysreg
> GCR_EL1, /* Tag Control Register */
> TFSRE0_EL1, /* Tag Fault Status Register (EL0) */
>
> + POR_EL0, /* Permission Overlay Register 0 (EL0) */
> +
> + /* FP/SIMD/SVE */
> + SVCR,
> + FPMR,
> +
> /* 32bit specific registers. */
> DACR32_EL2, /* Domain Access Control Register */
> IFSR32_EL2, /* Instruction Fault Status Register */
This is now a conflict between the kvm tree and Linus' tree.
--
Cheers,
Stephen Rothwell
Content of type "application/pgp-signature" skipped
Powered by blists - more mailing lists