Re: linux-next: manual merge of the fs-next tree with the mm-nonmm-unstable tree
From: Andrew Morton
Date: Tue Nov 17 2026 - 12:15:49 EST
On Tue, 17 Nov 2026 16:16:50 +0000 Mark Brown <broonie@xxxxxxxxxx> wrote:
> Today's linux-next merge of the fs-next tree got a conflict in:
>
> fs/proc/kcore.c
>
> between commit:
>
> 6b20f3da3436e ("proc/kcore: allow disabling /proc/kcore at boot")
>
> from the mm-nonmm-unstable tree and commit:
>
> 79011a80f0646 ("proc: give kcore, kmsg, the kpage files and profile their own file_operations")
>
> from the fs-next tree.
Thanks. I'll drop "proc/kcore: allow disabling /proc/kcore at boot".
Chris, could you please redo? Against fs-next, I guess. With the
ro_after_init thing that Kees suggested?