linux-kernel - Re: linux-next: manual merge of the kvm-arm tree with the arm64 tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <86le06v7mx.wl-maz@kernel.org>
Date: Thu, 05 Sep 2024 09:15:18 +0100
From: Marc Zyngier <maz@...nel.org>
To: Stephen Rothwell <sfr@...b.auug.org.au>
Cc: Christoffer Dall <cdall@...columbia.edu>,
	Catalin Marinas <catalin.marinas@....com>,
	Will Deacon <will@...nel.org>,
	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

On Thu, 05 Sep 2024 07:08:56 +0100,
Stephen Rothwell <sfr@...b.auug.org.au> wrote:
> 
> Hi all,
> 
> 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 */

All good, thanks Stephen.

	M.

-- 
Without deviation from the norm, progress is not possible.