On Tue, Aug 2, 2016 at 2:02 PM, Christian Borntraeger
<borntraeger@xxxxxxxxxx> wrote:
>
> Linus, do you use next as a tie-breaker for merge resolutions or is there
> a natural way of getting the fixups from Stephen?
No, I don't use the merge from linux-next directly. I just re-generate
the merge myself, and if the pull request then includes a merge
resolution (either as just a verbal description, or a patch or by
having a separate "merged" test-branch), I will compare my merge with
that one.
Linus
--
To unsubscribe from this list: send the line "unsubscribe kvm" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
