On Fri, 9 Aug 2024 17:14:40 +0200 Vlastimil Babka <[email protected]> wrote:
> On 8/9/24 17:12, Jann Horn wrote: > > On Fri, Aug 9, 2024 at 5:02 PM Vlastimil Babka <[email protected]> wrote: > >> On 8/7/24 12:31, Vlastimil Babka wrote: > >> > Also in git: > >> > https://git.kernel.org/vbabka/l/slab-kfree_rcu-destroy-v2r2 > >> > >> I've added this to slab/for-next, there will be some conflicts and here's > >> my > >> resulting git show or the merge commit I tried over today's next. > >> > >> It might look a bit different with tomorrow's next as mm will have v7 of > >> the > >> conflicting series from Jann: > >> > >> https://lore.kernel.org/all/[email protected]/ > >> > >> (also I did resolve it in the way I suggested to move Jann's block before > >> taking slab_mutex() but unless that happens in mm-unstable it would > >> probably be more > >> correct to keep where he did) > > > > Regarding my conflicting patch: Do you want me to send a v8 of that > > one now to move things around in my patch as you suggested? Or should > > we do that in the slab tree after the conflict has been resolved in > > Linus' tree, or something like that? > > I'm not sure which way of doing this would minimize work for maintainers... > > 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?
