On Wed, Sep 14, 2016 at 8:47 AM, Al Viro <[email protected]> wrote: > > Conflicts are trivial; I've pushed my variant of conflict resolution into > #proposed-merge.
Hmm. They may be trivial, but we disagreed about how to resolve the ia64 case.
I think I did a better job, obviously ;)
But if it turns out I screwed up, holler.
Linus
