On Tue, Nov 12, 2019 at 1:10 PM Paolo Bonzini <pbonzini@xxxxxxxxxx> wrote:
>
> It's not a particularly hard conflict, but I'm including anyway a
> resolution at the end of this email.
Hmm. My resolution has a slightly different conflict diff, that shows
another earlier part (that git ended up sorting out itself - maybe you
edited it out for that reason).
I think I did the right conflict resolution, but the difference in
diffs makes me just slightly nervous. Mind checking it?
Linus
