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:17:02 EST


On Tue, 17 Nov 2026 16:17:01 +0000 Mark Brown <broonie@xxxxxxxxxx> wrote:

> Hi all,
>
> Today's linux-next merge of the fs-next tree got a conflict in:
>
> kernel/profile.c
>
> between commits:
>
> 2ab6daee3c87d ("profile: account for partial /proc/profile reads")
> 0ff0b873d4d93 ("profile: simplify /proc/profile read layout")
>
> 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. This essentially discards Andrew's changes, AIUI
> the conversion to the iterator API ought to achieve roughly the same
> thing though I may be misunderstanding. I may also have messed up the
> merge somewhere.

OK, thanks, I'll make those two go away for now, will take another
look in the next -rc cycle.