lkml.org 
[lkml]   [2019]   [Dec]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
From
SubjectRe: [PATCH v15 00/23] Generic page walk and ptdump
Date
On Thu, 2019-12-05 at 08:15 -0500, Qian Cai wrote:
> > On Dec 4, 2019, at 11:32 AM, Steven Price <Steven.Price@arm.com>
> > wrote:
> >
> > I've bisected this problem and it's a merge conflict with:
> >
> > ace88f1018b8 ("mm: pagewalk: Take the pagetable lock in
> > walk_pte_range()")
>
> Sigh, how does that commit end up merging in the mainline without
> going through Andrew’s tree and missed all the linux-next testing? It
> was merged into the mainline Oct 4th?

It was acked by Andrew to be merged through a drm tree, since it was
part of a graphics driver functionality. It was preceded by a fairly
lenghty discussion on linux-mm / linux-kernel.

It was merged into drm-next on 19-11-28, I think that's when it
normally is seen by linux-next. Merged into mainline 19-11-30. Andrew's
tree got merged 19-12-05.

linux-next signaled a merge conflict from one of the patches in this
series (not this one) resolved manually with the akpm tree on 19-12-02.

Thomas






\
 
 \ /
  Last update: 2019-12-05 15:33    [W:0.063 / U:6.892 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site