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]
Date:   Tue, 17 Oct 2023 12:13:00 +0100
From:   Catalin Marinas <>
To:     Stephen Rothwell <>
Cc:     Christoffer Dall <>,
        Marc Zyngier <>, Will Deacon <>,
        Linux Kernel Mailing List <>,
        Linux Next Mailing List <>,
        Mark Rutland <>,
        Oliver Upton <>
Subject: Re: linux-next: manual merge of the kvm-arm tree with the arm64 tree

On Tue, Oct 17, 2023 at 12:30:17PM +1100, Stephen Rothwell wrote:
> Today's linux-next merge of the kvm-arm tree got a conflict in:
>   arch/arm64/kvm/arm.c
> between commit:
>   d8569fba1385 ("arm64: kvm: Use cpus_have_final_cap() explicitly")
> from the arm64 tree and commit:
>   ef150908b6bd ("KVM: arm64: Add generic check for system-supported vCPU features")
> from the kvm-arm tree.
> I fixed it up (I just used the latter) and can carry the fix as
> necessary.

Thanks Stephen. The fix looks fine, removing the
cpus_have_final_cap(ARM64_HAS_32BIT_EL1) check in


Powered by blists - more mailing lists