[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20190704135332.234891ac6ce641bf29913d06@linux-foundation.org>
Date: Thu, 4 Jul 2019 13:53:32 -0700
From: Andrew Morton <akpm@...ux-foundation.org>
To: Jason Gunthorpe <jgg@...lanox.com>
Cc: Christoph Hellwig <hch@...radead.org>,
Mark Rutland <mark.rutland@....com>,
Robin Murphy <robin.murphy@....com>,
"linux-mm@...ck.org" <linux-mm@...ck.org>,
"will.deacon@....com" <will.deacon@....com>,
"catalin.marinas@....com" <catalin.marinas@....com>,
"anshuman.khandual@....com" <anshuman.khandual@....com>,
"linux-arm-kernel@...ts.infradead.org"
<linux-arm-kernel@...ts.infradead.org>,
"linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>,
Michal Hocko <mhocko@...e.com>,
Dan Williams <dan.j.williams@...el.com>
Subject: Re: [PATCH v3 0/4] Devmap cleanups + arm64 support
On Thu, 4 Jul 2019 19:59:38 +0000 Jason Gunthorpe <jgg@...lanox.com> wrote:
> On Thu, Jul 04, 2019 at 11:53:24AM -0700, Andrew Morton wrote:
> > On Wed, 26 Jun 2019 20:35:51 -0700 Andrew Morton <akpm@...ux-foundation.org> wrote:
> >
> > > > Let me know and I can help orchestate this.
> > >
> > > Well. Whatever works. In this situation I'd stage the patches after
> > > linux-next and would merge them up after the prereq patches have been
> > > merged into mainline. Easy.
> >
> > All right, what the hell just happened?
>
> Christoph's patch series for the devmap & hmm rework finally made it
> into linux-next
We're talking about "dev_pagemap related cleanups v4", yes?
I note that linux-next contains "mm: remove the HMM config option"
which was present in Christoph's v3 series but wasn't present in v4.
Perhaps something has gone wrong here.
> sorry, it took quite a few iterations on the list to
> get all the reviews and tests, and figure out how to resolve some
> other conflicting things. So it just made it this week.
>
> Recall, this is the patch series I asked you about routing a few weeks
> ago, as it really exceeded the small area that hmm.git was supposed to
> cover. I think we are both caught off guard how big the conflict is!
I guess I was distracted - I should have taken a look to see how
mergable it all was.
It's a large patchset and it appears to be mainly (entirely?) code
cleanups. I don't think such material would be appropriate for a late
-rc7 merge even if it didn't conflict with lots of other higher
priority pending functional changes and fixes!
Powered by blists - more mailing lists