From: Matthew Wilcox <willy@infradead.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Vlastimil Babka <vbabka@suse.cz>,
Andrew Morton <akpm@linux-foundation.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Luiz Capitulino <luizcap@redhat.com>
Subject: Re: linux-next: manual merge of the slab tree with the mm-unstable tree
Date: Mon, 21 Jul 2025 20:38:09 +0100 [thread overview]
Message-ID: <aH6XIUX4xyo2pZfY@casper.infradead.org> (raw)
In-Reply-To: <20250721142001.3d1c8777@canb.auug.org.au>
On Mon, Jul 21, 2025 at 02:20:01PM +1000, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the slab tree got a conflict in:
>
> fs/proc/page.c
>
> between commit:
>
> a602ee331e31 ("fs: stable_page_flags(): use snapshot_page()")
>
> from the mm-unstable tree and commit:
>
> d8178294c53e ("proc: Remove mention of PG_slab")
>
> from the slab tree.
>
> I fixed it up (I just used the former version) and can carry the fix as
> necessary. This is now fixed as far as linux-next is concerned, but any
I think the snapshot_page commit was incorrect in removing this comment.
It is still valuable information. I think the comment from d8178294c53e
should remain in the tree after the resolution.
next prev parent reply other threads:[~2025-07-21 19:38 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-07-21 4:20 linux-next: manual merge of the slab tree with the mm-unstable tree Stephen Rothwell
2025-07-21 19:38 ` Matthew Wilcox [this message]
2025-07-21 21:35 ` Luiz Capitulino
2025-07-22 8:30 ` Vlastimil Babka
-- strict thread matches above, loose matches on Subject: below --
2025-09-04 6:20 Stephen Rothwell
2025-09-04 6:29 Stephen Rothwell
2025-09-04 8:39 ` Vlastimil Babka
2025-09-04 21:39 ` Andrew Morton
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=aH6XIUX4xyo2pZfY@casper.infradead.org \
--to=willy@infradead.org \
--cc=akpm@linux-foundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=luizcap@redhat.com \
--cc=sfr@canb.auug.org.au \
--cc=vbabka@suse.cz \
/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;
as well as URLs for NNTP newsgroup(s).