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

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

 



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



[Index of Archives]     [KVM ARM]     [KVM ia64]     [KVM ppc]     [Virtualization Tools]     [Spice Development]     [Libvirt]     [Libvirt Users]     [Linux USB Devel]     [Linux Audio Users]     [Yosemite Questions]     [Linux Kernel]     [Linux SCSI]     [XFree86]
  Powered by Linux