On Tue, Aug 2, 2016 at 2:02 PM, Christian Borntraeger <borntrae...@de.ibm.com> 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