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? Paolo -- 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
