From mboxrd@z Thu Jan 1 00:00:00 1970 From: Radim =?utf-8?B?S3LEjW3DocWZ?= Subject: Re: [GIT PULL] Please pull my kvm-ppc-next branch Date: Tue, 6 Dec 2016 14:50:46 +0100 Message-ID: <20161206135046.GD7972@potion> References: <20161206093544.GB25458@fergus.ozlabs.ibm.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Cc: Paolo Bonzini , kvm@vger.kernel.org, kvm-ppc@vger.kernel.org To: Paul Mackerras Return-path: Received: from mx1.redhat.com ([209.132.183.28]:33766 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752881AbcLFNvF (ORCPT ); Tue, 6 Dec 2016 08:51:05 -0500 Content-Disposition: inline In-Reply-To: <20161206093544.GB25458@fergus.ozlabs.ibm.com> Sender: kvm-owner@vger.kernel.org List-ID: 2016-12-06 20:35+1100, Paul Mackerras: > Hi Paolo or Radim, > > Please do another pull from my kvm-ppc-next branch, to get one more > commit for 4.10. This should eliminate a merge conflict with > upstream. Since 4.9-rc5, a commit (9e5f68842276) has gone upstream > which conflicts with commit ebe4535fbe7a in my tree, which has already > gone into kvm/next. The conflict is just lines added in the same > place, but it would be better to have the prototypes added by > ebe4535fbe7a in KVM-related headers anyway, since they are for KVM > functions. The new commit moves the prototypes to asm/kvm_ppc.h. > This has been in linux-next for a couple of days. Pulled, thanks.