linux-kernel - linux-next: manual merge of the slab tree with the mm 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 for Android: free password hash cracker in your pocket

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

Message-ID: <20231221173412.24b78407@canb.auug.org.au>
Date: Thu, 21 Dec 2023 17:34:12 +1100
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Vlastimil Babka <vbabka@...e.cz>, Andrew Morton
 <akpm@...ux-foundation.org>
Cc: Andrey Konovalov <andreyknvl@...il.com>, Andrey Konovalov
 <andreyknvl@...gle.com>, 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 the mm tree

Hi all,

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

  mm/slab.c

between commit:

  3ef36a834801 ("kasan: rename and document kasan_(un)poison_object_data")

from the mm tree and commit:

  16a1d968358a ("mm/slab: remove mm/slab.c and slab_def.h")

from the slab tree.

I fixed it up (I just removed the file) 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