From mboxrd@z Thu Jan 1 00:00:00 1970 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 Message-ID: References: <20180806151211.710b8615@canb.auug.org.au> Mime-Version: 1.0 Content-Type: text/plain; charset="iso-8859-2" Content-Transfer-Encoding: quoted-printable Return-path: In-Reply-To: <20180806151211.710b8615@canb.auug.org.au> Content-Language: en-US Content-ID: <2F560AE98EBC4A439A09680C1F38001A@APCP153.PROD.OUTLOOK.COM> Sender: linux-kernel-owner@vger.kernel.org To: Stephen Rothwell , Paolo Bonzini , =?iso-8859-2?Q?Radim_Kr=E8m=E1=F8?= , KVM , Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , Peter Zijlstra Cc: Linux-Next Mailing List , Linux Kernel Mailing List , Vitaly Kuznetsov , Tianyu Lan List-Id: linux-next.vger.kernel.org Hi Stephen: Thanks for fix. I will discuss with maintainer about how to deal with=20 the issue. On 8/6/2018 1:12 PM, Stephen Rothwell wrote: > Hi all, >=20 > Today's linux-next merge of the kvm tree got a conflict in: >=20 > arch/x86/include/asm/trace/hyperv.h >=20 > between commit: >=20 > 58ec5e9c9044 ("x86/hyper-v: Trace PV IPI send") >=20 > from the tip tree and commit: >=20 > 47c054685621 ("X86/Hyper-V: Add hyperv_nested_flush_guest_mapping ftra= ce support") >=20 > from the kvm tree. >=20 > 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. > =