linux-kernel - Re: [-next conflict imminent] Re: [PATCH v2 0/7] mm, slub: handle pending kfree_rcu() in kmem_cache

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: <20240810133034.433d3e1338d3bd8a0c90bf45@linux-foundation.org>
Date: Sat, 10 Aug 2024 13:30:34 -0700
From: Andrew Morton <akpm@...ux-foundation.org>
To: Vlastimil Babka <vbabka@...e.cz>
Cc: Stephen Rothwell <sfr@...b.auug.org.au>, Jann Horn <jannh@...gle.com>,
 "Paul E. McKenney" <paulmck@...nel.org>, Joel Fernandes
 <joel@...lfernandes.org>, Josh Triplett <josh@...htriplett.org>, Boqun Feng
 <boqun.feng@...il.com>, Christoph Lameter <cl@...ux.com>, David Rientjes
 <rientjes@...gle.com>, Steven Rostedt <rostedt@...dmis.org>, Mathieu
 Desnoyers <mathieu.desnoyers@...icios.com>, Lai Jiangshan
 <jiangshanlai@...il.com>, Zqiang <qiang.zhang1211@...il.com>, Julia Lawall
 <Julia.Lawall@...ia.fr>, Jakub Kicinski <kuba@...nel.org>,
 "Jason A. Donenfeld" <Jason@...c4.com>, "Uladzislau Rezki (Sony)"
 <urezki@...il.com>, Roman Gushchin <roman.gushchin@...ux.dev>, Hyeonggon
 Yoo <42.hyeyoo@...il.com>, linux-mm@...ck.org,
 linux-kernel@...r.kernel.org, rcu@...r.kernel.org, Alexander Potapenko
 <glider@...gle.com>, Marco Elver <elver@...gle.com>, Dmitry Vyukov
 <dvyukov@...gle.com>, kasan-dev@...glegroups.com, Mateusz Guzik
 <mjguzik@...il.com>
Subject: Re: [-next conflict imminent] Re: [PATCH v2 0/7] mm, slub: handle
 pending kfree_rcu() in kmem_cache_destroy()

On Sat, 10 Aug 2024 22:25:05 +0200 Vlastimil Babka <vbabka@...e.cz> wrote:

> >> I guess it would be easiest to send a -fix to Andrew as it's rather minor
> >> change. Thanks!
> > 
> > That's quite a large conflict.  How about we carry Jann's patchset in
> > the slab tree?
> 
> OK I've done that and pushed to slab/for-next. Had no issues applying
> the kasan parts and merge with mm-unstable (locally rebased with Jann's
> commits dropped) had no conflicts either so it should work fine. Thanks!

Cool.  I have dropped the copy of v8 from mm.git.