linux-kernel - Re: linux-next: manual merge of the kvm-x86 tree with the kvm-fixes 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] [day] [month] [year] [list]

Message-ID: <Zg1Z9qs108PoXeMm@google.com>
Date: Wed, 3 Apr 2024 06:30:30 -0700
From: Sean Christopherson <seanjc@...gle.com>
To: Stephen Rothwell <sfr@...b.auug.org.au>
Cc: Paolo Bonzini <pbonzini@...hat.com>, KVM <kvm@...r.kernel.org>, 
	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 kvm-fixes tree

On Wed, Apr 03, 2024, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the kvm-x86 tree got a conflict in:
> 
>   tools/testing/selftests/kvm/include/x86_64/processor.h
> 
> between commit:
> 
>   0d1756482e66 ("Merge tag 'kvm-x86-pvunhalt-6.9' of https://github.com/kvm-x86/linux into HEAD")
> 
> from the kvm-fixes tree and commit:
> 
>   964d0c614c7f ("Merge branch 'hyperv'")
> 
> from the kvm-x86 tree.
> 
> I fixed it up (I used the former version)

Perfect, I'll drop my branch.  Thanks!