From mboxrd@z Thu Jan 1 00:00:00 1970 From: Paul Mackerras Subject: [GIT PULL] Please pull my kvm-ppc-next branch Date: Tue, 6 Dec 2016 20:35:44 +1100 Message-ID: <20161206093544.GB25458@fergus.ozlabs.ibm.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii To: Paolo Bonzini , Radim =?utf-8?B?S3LEjW3DocWZ?= , kvm@vger.kernel.org, kvm-ppc@vger.kernel.org Return-path: Received: from ozlabs.org ([103.22.144.67]:38755 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753136AbcLFJfw (ORCPT ); Tue, 6 Dec 2016 04:35:52 -0500 Content-Disposition: inline Sender: kvm-owner@vger.kernel.org List-ID: 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. Thanks, Paul. The following changes since commit ffcb09f27f46ea21305c7846de1fd3b76e4e6a6f: Merge branch 'kvm-ppc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc (2016-11-29 14:26:55 +0100) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc.git kvm-ppc-next for you to fetch changes up to e34af7849014f1d80899b811cf9021588cb8dd88: KVM: PPC: Book3S: Move prototypes for KVM functions into kvm_ppc.h (2016-12-01 14:03:46 +1100) ---------------------------------------------------------------- Paul Mackerras (1): KVM: PPC: Book3S: Move prototypes for KVM functions into kvm_ppc.h arch/powerpc/include/asm/asm-prototypes.h | 44 ------------------------------- arch/powerpc/include/asm/kvm_ppc.h | 42 +++++++++++++++++++++++++++++ arch/powerpc/kvm/book3s_64_vio_hv.c | 1 - arch/powerpc/kvm/book3s_hv_builtin.c | 1 - arch/powerpc/kvm/book3s_hv_ras.c | 2 +- arch/powerpc/kvm/book3s_hv_rm_mmu.c | 1 - arch/powerpc/kvm/book3s_hv_rm_xics.c | 1 - 7 files changed, 43 insertions(+), 49 deletions(-)