From: Andrew Morton <akpm@linux-foundation.org>
To: Mark Brown <broonie@kernel.org>
Cc: Christian Brauner <brauner@kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: Re: linux-next: manual merge of the fs-next tree with the mm-nonmm-unstable tree
Date: Tue, 17 Nov 2026 09:16:50 -0800 [thread overview]
Message-ID: <20261117091650.fc2f9558e84f76a5cdbfe7b4@linux-foundation.org> (raw)
In-Reply-To: <avx9_c_HWPAl9i1Q@sirena.org.uk>
On Tue, 17 Nov 2026 16:17:01 +0000 Mark Brown <broonie@kernel.org> 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.
next prev parent reply other threads:[~2026-11-17 17:16 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-11-17 16:17 Mark Brown
2026-11-17 17:16 ` Andrew Morton [this message]
-- strict thread matches above, loose matches on Subject: below --
2026-11-17 16:16 Mark Brown
2026-11-17 17:15 ` Andrew Morton
2026-04-06 13:13 Mark Brown
2026-04-06 16:25 ` Andrew Morton
2026-04-07 2:19 ` Joseph Qi
2026-04-07 3:39 ` Andrew Morton
2026-04-07 10:54 ` Mark Brown
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20261117091650.fc2f9558e84f76a5cdbfe7b4@linux-foundation.org \
--to=akpm@linux-foundation.org \
--cc=brauner@kernel.org \
--cc=broonie@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®