On 12/27/23 23:01, Andrew Morton wrote: > On Fri, 22 Dec 2023 20:28:05 +0000 "Matthew Wilcox (Oracle)" <willy@xxxxxxxxxxxxx> wrote: > >> Add folio_alloc_node() to replace alloc_pages_node() and then use >> folio APIs throughout instead of converting back to pages. >> >> Signed-off-by: Matthew Wilcox (Oracle) <willy@xxxxxxxxxxxxx> >> --- >> include/linux/gfp.h | 9 +++++++++ >> mm/slub.c | 15 +++++++-------- > > This depends on changes which are in Vlastimil's tree and linux-next. > So I reworked it to not do that, which means there will be a resolution > for Linus to do, which Stephen will tell us about. It's simple, just > from code motion. Basing series on a specific tree (mm in this case) and not whole linux-next would be the way. But also Matthew said in v2 he didn't expect the series to be picked up for 6.8 at this point so it was fair to use linux-next for review, and for a final posting for 6.9 it could simply have 6.8-rc1 as a base. > Maybe mm.git should include the slab tree, I haven't really considered > what would be the implications of that. I think this cycle is exceptional in that SLAB removal is unusually large, so normally there should be little to no conflicts. We can revisit if this becomes more common?