Messages in this thread | | | From | Tianyu Lan <> | Subject | Re: linux-next: manual merge of the kvm tree with the tip tree | Date | Mon, 6 Aug 2018 06:27:13 +0000 |
| |
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. >
| |