lkml.org 
[lkml]   [2018]   [Aug]   [6]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
From
SubjectRe: linux-next: manual merge of the kvm tree with the tip tree
Date
Hi Stephen:
Thanks for fix. I will discuss with maintainer about how to deal with
the issue.

On 8/6/2018 1:12 PM, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the kvm tree got a conflict in:
>
> arch/x86/include/asm/trace/hyperv.h
>
> between commit:
>
> 58ec5e9c9044 ("x86/hyper-v: Trace PV IPI send")
>
> from the tip tree and commit:
>
> 47c054685621 ("X86/Hyper-V: Add hyperv_nested_flush_guest_mapping ftrace support")
>
> from the kvm tree.
>
> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging. You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.
>
\
 
 \ /
  Last update: 2018-08-06 08:28    [W:0.056 / U:0.692 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site