On 12/30/22 11:30, Uwe Kleine-König wrote: > - In various files below mm/ between > > git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git master > ??? > > and > > git://git.kernel.org/pub/scm/linux/kernel/git/vbabka/slab.git for-next > ??? That's weird, because slab.git for-next is still exactly what was merged to 6.2-rc1, so when I try to merge it to master I just get "Already up to date." > I didn't feel confident to fix this conflict correctly and skipped merging the slab tree. Nothing is lost then, but maybe it indicates some issue with your approach? (didn't try to replicate it in full) > - In various files belwo mm/ between > > git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git master > ??? > > and > > git://git.infradead.org/users/willy/pagecache.git for-next > ??? > > As above I didn't even try to fix these up and skipped merging the folio tree > > Best regards > Uwe >
