linux-next: manual merge of the akpm-current tree with the folio tree

Stephen Rothwell
2022-02-15T07:00:49Z

[-- Attachment #1: Type: text/plain, Size: 584 bytes --]

Hi all,

Today's linux-next merge of the block tree got conflicts in:

include/linux/mm.h
include/linux/rmap.h
mm/gup.c
mm/huge_memory.c
mm/internal.h
mm/memory-failure.c
mm/migrate.c
mm/mlock.c
mm/rmap.c
mm/vmscan.c

There is no way I can figure out in a reasonable time (or at all
probably) the resolution needed here. You guys need to get together
and figure out how the folio tree changes are going to progress to
Linus' tree.

I have gone back and used the folio tree from next-20220204 again for
today.