* Peter Zijlstra <peterz@xxxxxxxxxxxxx> wrote: > On Fri, Aug 11, 2017 at 01:56:07PM +0200, Ingo Molnar wrote: > > I've done a minimal conflict resolution merge locally. Peter, could you please > > double check my resolution, in: > > > > 040cca3ab2f6: Merge branch 'linus' into locking/core, to resolve conflicts > > That merge is a bit wonky, but not terminally broken afaict. > > It now does two TLB flushes, the below cleans that up. Cool, thanks - I've applied it as a separate commit, to reduce the evilness of the merge commit. Will push it all out in time to make Stephen's Monday morning a bit less of a Monday morning. Thanks, Ingo -- To unsubscribe from this list: send the line "unsubscribe linux-next" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
