From mboxrd@z Thu Jan 1 00:00:00 1970 From: Radim =?utf-8?B?S3LEjW3DocWZ?= Subject: Re: [GIT PULL] Please pull paulus/powerpc kvm-ppc-fixes-4.14-2 tag Date: Thu, 9 Nov 2017 19:01:20 +0100 Message-ID: <20171109180120.GA15561@flask> References: <20171108110328.GC9689@fergus.ozlabs.ibm.com> <11532925-e9cf-9363-6225-ec0c0252917c@redhat.com> <20171109052509.vkbxmlzgmo73gc75@oak.ozlabs.ibm.com> <8e898f31-f0b2-e30f-594e-aee46e943a4d@redhat.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Cc: Paul Mackerras , kvm@vger.kernel.org, kvm-ppc@vger.kernel.org To: Paolo Bonzini Return-path: Received: from mx1.redhat.com ([209.132.183.28]:52014 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752637AbdKISBX (ORCPT ); Thu, 9 Nov 2017 13:01:23 -0500 Content-Disposition: inline In-Reply-To: <8e898f31-f0b2-e30f-594e-aee46e943a4d@redhat.com> Sender: kvm-owner@vger.kernel.org List-ID: 2017-11-09 10:46+0100, Paolo Bonzini: > On 09/11/2017 06:25, Paul Mackerras wrote: > >> Could you > >> redo the fix on top of an older tag (e.g. on top of 4.14-rc3), and then: > >> > >> - I pull the fix from you for 4.14 > >> > >> - you pull the fix yourself into kvm-ppc-next, and fix the conflicts? > > My kvm-ppc-fixes branch is based directly on 4.14-rc4, which is prior > > to the changes in the kvm next branch and my kvm-ppc-next branch, so I > > don't see that I need to redo the fix. > > > > I have merged kvm-ppc-fixes into kvm-ppc-next, resolved the conflicts, > > and then applied another cosmetic patch on top to make the result look > > nicer (with no functional change in that patch). Doing that merge > > also resolved another conflict (in arch/powerpc/kvm/powerpc.c). > > > > So please do the pull from the existing kvm-ppc-fixes-4.14-2 tag for > > 4.14, and I'll send you a pull request for kvm-ppc-next. > > Sounds good. Radim is probably going to do the pull. Pulled both and sending this one to Linus tomorrow, thanks.