On Thu, Jul 04, 2019 at 01:53:32PM -0700, Andrew Morton wrote: > On Thu, 4 Jul 2019 19:59:38 +0000 Jason Gunthorpe <jgg@xxxxxxxxxxxx> 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@xxxxxxxxxxxxxxxxxxxx> 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. When CH sent v4 to the list it was corrupted, v3 is the one to reference for content. Here is the mailing thread discussing this: https://lore.kernel.org/linux-mm/20190702184201.GO31718@xxxxxxxxxxxx/ > > 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. Okay, fair enough. I also could have also done more checks myself with linux-next > 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! I see your other email you resolved the conflicts - so please let me know if you want to proceed with dropping CH's series or not, I'll make a special effort to get that change into tomorrows linux-next if you want (it is already 6pm here) Regards, Jason
