On 28/04/16 14:16, Alex Bennée wrote: > Sergey Fedorov <sergey.fedo...@linaro.org> writes: > >> From: Sergey Fedorov <serge.f...@gmail.com> >> >> This series combines a set of patches which is meant to improve overall code >> structure and readability of the direct block chaining mechanism. The other >> point is to make a step towards thread safety of TB chainig. >> >> The series' tree can be found in a public git repository [1]. >> >> [1] https://github.com/sergefdrv/qemu/tree/tb-chaining-cleanup-v4 > I've run into a bunch of merge failures whilst trying to build a > combined tree. A bunch in the tcg/* files due to atomic patching fixes > now in rth/tcg-next and the final one due to the code motion in cpu-exec > from the misc clean-ups. > > It might be worth re-basing at least on tcg-next?
Okay, I'll do a re-base and send v5 today. Kind regards, Sergey