On Sun, 21 Jul 2024 at 15:10, Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> wrote: > > - In the series "treewide: Refactor heap related implementation", > Kuan-Wei Chiu has significantly reworked the min_heap library code and > has taught bcachefs to use the new more generic implementation. Bah. I think the users should probably have been converted in their own trees, instead of having this thing that caused a somewhat nasty conflict. I think I sorted it out correctly, but I'm not seeing why the bcachefs conversion was done outside the bcachefs tree. (Ok, it's not like the conflict was all that nasty, really. It's more that conflicts in this _kind_ of code is a bit nasty). As it is, I do see the Ack from Kent, but I'm going to ask him to also double-check my merge. I see what happened in linux-next, but that state also seems different from my tree (at a minimum, Kent also moved the tiemr_lock around a bit too). Anyway.. The conflict resolution looks sane to me and doesn't seem fundamentally complex, but (a) mistakes happen and (b) it does seem like this whole heap conversion could have happened in the bcachefs tree. Kent, mind checking that I didn't do something horribly horribly bad? Linus