Richard Henderson <r...@twiddle.net> writes: > On 05/03/2016 07:26 AM, Emilio G. Cota wrote: >> On Tue, May 03, 2016 at 08:36:35 +0100, Alex Bennée wrote: >>> Emilio G. Cota <c...@braap.org> writes: >>>> static TranslationBlock *tb_find_physical(CPUState *cpu, >>>> target_ulong pc, >>>> target_ulong cs_base, >>>> uint32_t flags) >>> >>> This does not apply cleanly to master due to the flag change. You should >>> either reference the clean-up patch or include it in the series. >> >> Ouch, sorry. Won't happen again. >> >> Grab the missing pre-requisite patch from: >> http://patchwork.ozlabs.org/patch/607662/mbox/ > > Well, that said, there are further conflicts within my tcg-next tree. > If you'll rebase on > > git://github.com/rth7680/qemu.git tcg-next
FYI I did build a tree on which to base the rest of the MTTCG work: https://github.com/stsquad/qemu/commits/mttcg/tcg-next-plus-qht > > I'll queue the patchset for 2.7. > > > r~ -- Alex Bennée
