On Sat, Jul 6, 2019 at 10:04 PM Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> wrote: > > On Fri, 5 Jul 2019 12:08:15 +0000 Jason Gunthorpe <jgg@xxxxxxxxxxxx> wrote: > > > On Thu, Jul 04, 2019 at 04:29:55PM -0700, Dan Williams wrote: > > > Guys, Andrew has kicked the subsection patches out of -mm because of > > > the merge conflicts. Can we hold off on the hmm cleanups for this > > > cycle? > > > > I agree with you we should prioritize your subsection patches over > > CH's cleanup if we cannot have both. > > > > As I said, I'll drop CH's at Andrews request, but I do not want to > > make any changes without being aligned with him. > > OK, I had a shot at repairing the damage on top of current linux-next. > The great majority of the issues were in > mm-devm_memremap_pages-enable-sub-section-remap.patch. > > Below are the rejects which I saw and below that is my attempt to > resolve it all. Dan, please go through this with a toothcomb. I've > just done an mmotm release with all this in it so please do whatever's > needed to verify that it's all working correctly. Apologies for the delay, I was offline last week for a move. This looks good to me and even caught some "X >> PAGE_SHIFT" to "PHYS_PFN(X)" conversions that I missed. It also passes my testing. Thank you accommodating a rebase. Now to take a look at Oscar's fixes.
