Re: [GIT PULL] XArray for 4.20
From: Matthew Wilcox
Date: Sun Oct 28 2018 - 15:27:49 EST
On Sun, Oct 28, 2018 at 12:21:19PM -0700, Linus Torvalds wrote:
> On Sun, Oct 28, 2018 at 12:13 PM Matthew Wilcox <willy@xxxxxxxxxxxxx> wrote:
> > On Sun, Oct 28, 2018 at 11:50:19AM -0700, Linus Torvalds wrote:
> > > NOTE! I did get some conflicts with other stuff, and while the
> > > conflict resolution all looked pretty straightforward, this does want
> > > looking at.
> > >
> > > Particularly the mm/workingset.c code.
> > I've been rebasing the xarray-conv branch on your tree pretty regularly
> > this week, so I have a fairly good idea how I think it should look.
> > I'll check to see if you & I have the same thoughts when you push it out.
> It's pushed out now. I'm running the kernel now, but have done only
> basic boot testing (in addition to my usual build tests), no real
Yep, no differences in how we resolved the conflicts.