lkml.org 
[lkml]   [2024]   [Apr]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
SubjectRe: linux-next: manual merge of the kvm-x86 tree with the kvm-fixes tree
From
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!

\
 
 \ /
  Last update: 2024-05-27 16:22    [W:0.035 / U:0.412 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site