Messages in this thread | | | Date | Fri, 28 Apr 2023 20:50:34 -0400 | Subject | Re: [GIT PULL] scheduler changes for v6.4 | From | Mathieu Desnoyers <> |
| |
On 2023-04-28 18:02, Linus Torvalds wrote: > On Thu, Apr 27, 2023 at 1:51 PM Ingo Molnar <mingo@kernel.org> wrote: >> >> - Fix performance regression introduced by mm_cid > > This causes a conflict with commit b20b0368c614 ("mm: fix memory leak > on mm_init error handling") that came in through the MM tree. > > That conflict is trivial to resolve, and I did so. > > Except I also checked my resolution with what was going on in > linux-next, and it's different. > > I'm pretty sure the resolution in linux-next is wrong, but I thought > I'd mention this, since clearly this wasn't caught in linux-next. > > Or maybe it's me that did it wrong, but hey, that couldn't actually > happen, could it?
I've reviewed both merge commits (c79e0731da from next-20230428 and 586b222d74 from master) and I confirm that your conflict resolution is correct. The one in next was wrong.
Thanks,
Mathieu
-- Mathieu Desnoyers EfficiOS Inc. https://www.efficios.com
| |