[lkml]   [2017]   [Aug]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
Messages in this thread
SubjectRe: linux-next: manual merge of the akpm-current tree with the tip tree

* Peter Zijlstra <> 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.



 \ /
  Last update: 2017-08-11 14:45    [W:0.155 / U:0.220 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site