linux-kernel - Re: linux-next: manual merge of the slab tree with the mm-unstable tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <aH6XIUX4xyo2pZfY@casper.infradead.org>
Date: Mon, 21 Jul 2025 20:38:09 +0100
From: Matthew Wilcox <willy@...radead.org>
To: Stephen Rothwell <sfr@...b.auug.org.au>
Cc: Vlastimil Babka <vbabka@...e.cz>,
	Andrew Morton <akpm@...ux-foundation.org>,
	Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
	Linux Next Mailing List <linux-next@...r.kernel.org>,
	Luiz Capitulino <luizcap@...hat.com>
Subject: Re: linux-next: manual merge of the slab tree with the mm-unstable
 tree

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.