[GIT PULL] Please pull my kvm-ppc-next branch

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



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(-)
--
To unsubscribe from this list: send the line "unsubscribe kvm-ppc" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html



[Index of Archives]     [KVM Development]     [KVM ARM]     [KVM ia64]     [Linux Virtualization]     [Linux USB Devel]     [Linux Video]     [Linux Audio Users]     [Linux Kernel]     [Linux SCSI]     [Big List of Linux Books]

  Powered by Linux