linux-kernel - Re: [GIT PULL] scheduler changes for v6.4

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: <3f452ee7-6430-e7a9-590b-b211ad4c7ea5@efficios.com>
Date:   Fri, 28 Apr 2023 20:50:34 -0400
From:   Mathieu Desnoyers <mathieu.desnoyers@...icios.com>
To:     Linus Torvalds <torvalds@...ux-foundation.org>,
        Ingo Molnar <mingo@...nel.org>,
        Andrew Morton <akpm@...ux-foundation.org>
Cc:     linux-kernel@...r.kernel.org,
        Peter Zijlstra <peterz@...radead.org>,
        Thomas Gleixner <tglx@...utronix.de>,
        Borislav Petkov <bp@...en8.de>,
        Juri Lelli <juri.lelli@...hat.com>,
        Vincent Guittot <vincent.guittot@...aro.org>,
        Dietmar Eggemann <dietmar.eggemann@....com>,
        Steven Rostedt <rostedt@...dmis.org>,
        Ben Segall <bsegall@...gle.com>, Mel Gorman <mgorman@...e.de>,
        Daniel Bristot de Oliveira <bristot@...hat.com>,
        Valentin Schneider <vschneid@...hat.com>
Subject: Re: [GIT PULL] scheduler changes for v6.4

On 2023-04-28 18:02, Linus Torvalds wrote:
> On Thu, Apr 27, 2023 at 1:51 PM Ingo Molnar <mingo@...nel.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