On 28/08/2019 00:36, Jason Gunthorpe wrote: > On Tue, Aug 27, 2019 at 04:34:31PM -0700, Andrew Morton wrote: >> On Tue, 27 Aug 2019 01:34:13 +0000 Jason Gunthorpe <jgg@xxxxxxxxxxxx> wrote: >> >>> On Sat, Aug 24, 2019 at 03:26:55PM -0700, Christoph Hellwig wrote: >>>> On Fri, Aug 23, 2019 at 01:43:12PM +0000, Jason Gunthorpe wrote: >>>>>> So what is the plan forward? Probably a little late for 5.3, >>>>>> so queue it up in -mm for 5.4 and deal with the conflicts in at least >>>>>> hmm? Queue it up in the hmm tree even if it doesn't 100% fit? >>>>> >>>>> Did we make a decision on this? Due to travel & LPC I'd like to >>>>> finalize the hmm tree next week. >>>> >>>> I don't think we've made any decision. I'd still love to see this >>>> in hmm.git. It has a minor conflict, but I can resend a rebased >>>> version. >>> >>> I'm looking at this.. The hmm conflict is easy enough to fix. >>> >>> But the compile conflict with these two patches in -mm requires some >>> action from Andrew: >>> >>> commit 027b9b8fd9ee3be6b7440462102ec03a2d593213 >>> Author: Minchan Kim <minchan@xxxxxxxxxx> >>> Date: Sun Aug 25 11:49:27 2019 +1000 >>> >>> mm: introduce MADV_PAGEOUT >>> >>> commit f227453a14cadd4727dd159782531d617f257001 >>> Author: Minchan Kim <minchan@xxxxxxxxxx> >>> Date: Sun Aug 25 11:49:27 2019 +1000 >>> >>> mm: introduce MADV_COLD >>> >>> Patch series "Introduce MADV_COLD and MADV_PAGEOUT", v7. >>> >>> I'm inclined to suggest you send this series in the 2nd half of the >>> merge window after this MADV stuff lands for least disruption? >> >> Just merge it, I'll figure it out. Probably by staging Minchan's >> patches after linux-next. > > Okay, I'll get it on a branch and merge it toward hmm.git tomorrow > > Steven, do you need the branch as well for your patch series? Let me know Since my series is (mostly) just refactoring I'm planning on rebasing it after -rc1 and aim for v5.4 - I don't really have the time just now to do that. But please keep me in the loop because it'll reduce the surprises when I do do the rebase. Thanks, Steve
