linux-kernel - Re: linux-next: manual merge of the kvm-x86 tree with the tip 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 for Android: free password hash cracker in your pocket

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

Message-ID: <Z4AhAFlk5qOYMsJx@google.com>
Date: Thu, 9 Jan 2025 11:18:24 -0800
From: Sean Christopherson <seanjc@...gle.com>
To: Stephen Rothwell <sfr@...b.auug.org.au>
Cc: Thomas Gleixner <tglx@...utronix.de>, Ingo Molnar <mingo@...hat.com>, 
	"H. Peter Anvin" <hpa@...or.com>, Peter Zijlstra <peterz@...radead.org>, 
	"Borislav Petkov (AMD)" <bp@...en8.de>, 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-x86 tree with the tip tree

On Mon, Jan 06, 2025, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the kvm-x86 tree got a conflict in:
> 
>   arch/x86/kvm/cpuid.c
> 
> between commit:
> 
>   716f86b523d8 ("KVM: x86: Advertise SRSO_USER_KERNEL_NO to userspace")
> 
> from the tip tree and commits:
> 
>   ccf93de484a3 ("KVM: x86: Unpack F() CPUID feature flag macros to one flag per line of code")
>   3cc359ca29ad ("KVM: x86: Rename kvm_cpu_cap_mask() to kvm_cpu_cap_init()")
>   75c489e12d4b ("KVM: x86: Add a macro for features that are synthesized into boot_cpu_data")
>   871ac338ef55 ("KVM: x86: Use only local variables (no bitmask) to init kvm_cpu_caps")
> 
> from the kvm-x86 tree.
> 
> I fixed it up (I think - see below) and can carry the fix as
> necessary. 

Your resolution is good.  I'm impressed you were able to wade through the chaos :-)

Thanks much!