On 09.04.15 10:49, Paolo Bonzini wrote: > > > On 09/04/2015 00:57, Alexander Graf wrote: >>> >>> The last patch in this series needs a definition of PPC_MSGCLR that is >>> added by the patch "powerpc/powernv: Fixes for hypervisor doorbell >>> handling", which has now gone upstream into Linus' tree as commit >>> 755563bc79c7 via the linuxppc-dev mailing list. Alex, how do you want >>> to handle that? You could pull in the master branch of the kvm tree, >>> which includes 755563bc79c7, or you could cherry-pick 755563bc79c7 and >>> let the subsequent merge fix it up. >> >> I've just cherry-picked it for now since it still lives in my queue, so >> it will get thrown out automatically once I rebase on next if it's >> included in there. >> >> Paolo / Marcelo, could you please try to somehow get the commit above >> into the next branch somehow? I guess the easiest would be to merge >> linus/master into kvm/next. >> >> Thanks, applied all to kvm-ppc-queue. > > I plan to send the x86/MIPS/s390/ARM merge very early to Linus, maybe > even tomorrow. So you can just rebase on top of 4.0-rc6 and send your > pull request relative to Linus's tree instead of kvm/next. > > Does that work for you?
Phew, that really complicates things on my side. I usually do kvm-ppc-queue -> kvm-ppc-next -> kvm/next which means that my queue already contains your next patches. I could of course to a rebase --onto and remove anything that is in the kvm tree, but then we'd end up conflicting on documentation changes. Since you already did send out the first pull request, just let me know when you pulled linus' tree back into kvm/next (or kvm/master) so that I can fast-forward merge this in my kvm-ppc-next branch and then rebase my queue on top, merge it into the next branch and send you a pull request ;) Alex -- To unsubscribe from this list: send the line "unsubscribe kvm" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
