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

On Fri, 11 Aug 2017 14:44:25 +0200 Ingo Molnar <mingo@kernel.org> wrote:
>
> * Peter Zijlstra <peterz@infradead.org> 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 you very much.

--
Cheers,
Stephen Rothwell

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