linux-kernel - linux-next: manual merge of the slab tree with Linus' 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>] [day] [month] [year] [list]

Message-ID: <20240603123251.473fca71@canb.auug.org.au>
Date: Mon, 3 Jun 2024 12:33:09 +1000
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Vlastimil Babka <vbabka@...e.cz>
Cc: Kees Cook <kees@...nel.org>, Linux Kernel Mailing List
 <linux-kernel@...r.kernel.org>, Linux Next Mailing List
 <linux-next@...r.kernel.org>
Subject: linux-next: manual merge of the slab tree with Linus' tree

Hi all,

Today's linux-next merge of the slab tree got a conflict in:

  lib/fortify_kunit.c

between commit:

  99a6087dfdc6 ("kunit/fortify: Remove __kmalloc_node() test")

from Linus' tree and commit:

  a0a44d9175b3 ("mm, slab: don't wrap internal functions with alloc_hooks()")

from the slab tree.

I fixed it up (the latter includes the former, so I just used the latter)
and can carry the fix as necessary. This is now fixed as far as linux-next
is concerned, but any non trivial conflicts should be mentioned to your
upstream maintainer when your tree is submitted for merging.  You may
also want to consider cooperating with the maintainer of the conflicting
tree to minimise any particularly complex conflicts.

-- 
Cheers,
Stephen Rothwell

Content of type "application/pgp-signature" skipped