On Sat, Aug 6, 2016 at 11:46 PM, Al Viro <v...@zeniv.linux.org.uk> wrote: > > I went for the second variant (backmerge), but if you prefer the third one, > just pull #for-linus-2 and I'll send a separate pull request for the last > commit. Or just cherry-pick that last commit from #for-linus after having > pulled #for-linus-2.
Please don't do back-merges to avoid conflicts. I'd *much* rather just
get the conflict. Especially when it's that trivial.
Linus
