lkml.org 
[lkml]   [2020]   [Apr]   [2]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
SubjectRe: linux-next: manual merge of the kvm tree with Linus' tree
From
Date
On 02/04/20 04:36, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the kvm tree got a conflict in:
>
> arch/x86/kvm/svm/svm.c
>
> between commits:
>
> aaca21007ba1 ("KVM: SVM: Fix the svm vmexit code for WRMSR")
> 2da1ed62d55c ("KVM: SVM: document KVM_MEM_ENCRYPT_OP, let userspace detect if SEV is available")
> 2e2409afe5f0 ("KVM: SVM: Issue WBINVD after deactivating an SEV guest")
>
> from Linus' tree and commits:
>
> 83a2c705f002 ("kVM SVM: Move SVM related files to own sub-directory")
> 41f08f0506c0 ("KVM: SVM: Move SEV code to separate file")
>
> (at least)
>
> from the kvm tree.
>
> Its a bit of a pain this code movement appearing during the merge
> window. Is it really intended for v5.7?

Yes, it's just due to code movement (a file was split, which I left last
to avoid pain for contributors and minimal room for regressions).
Unfortunately, git ends up being confused, but "git merge -X histogram"
actually does the right thing.

Paolo

[unhandled content-type:application/pgp-signature]
\
 
 \ /
  Last update: 2020-04-02 10:15    [W:0.065 / U:0.660 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site