From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id CB931C77B61 for ; Sat, 29 Apr 2023 00:50:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1347140AbjD2Auh (ORCPT ); Fri, 28 Apr 2023 20:50:37 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56328 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230104AbjD2Auf (ORCPT ); Fri, 28 Apr 2023 20:50:35 -0400 Received: from smtpout.efficios.com (unknown [IPv6:2607:5300:203:b2ee::31e5]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5A0271FDC for ; Fri, 28 Apr 2023 17:50:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=efficios.com; s=smtpout1; t=1682729430; bh=uXmLRJCXUMtgrh3QRYxDEF/Jvand7ry+DuudTApOWts=; h=Date:Subject:To:Cc:References:From:In-Reply-To:From; b=Ej8/3XYPAkMI7Y2jzO9bKsitNFVlbfhoY/xuL4oKQ66EDzv7nNk7idbvi+Jyb7XgR taYYTAF6YhEp3kpk1z5ovI4uX3Q+zfG686Vcv1VfCHDvBnsA66H906Zs5Rw0uzKngo izPUUYqKw8KFzU/whxzWGrknM69t3Qx40oc+44ajY+XZEa3+GF1V+8QnGU6Oip8Si5 /UxBxrhKKgqAwyAshotFY5AqdW9bRtZytOH0oMKEkLLitZZ8pSP48fBc54nFz7p9Sq ZrSgURuwtElxhSiT0nMna5GtMH2Xfhehrdj1w8QFaOiTAkTew/K+bHvpGRDTBdsZEh 2IZnKhGL5tG0w== Received: from [10.1.0.205] (192-222-203-73.qc.cable.ebox.net [192.222.203.73]) by smtpout.efficios.com (Postfix) with ESMTPSA id 4Q7W9K5C4zzxFm; Fri, 28 Apr 2023 20:50:29 -0400 (EDT) Message-ID: <3f452ee7-6430-e7a9-590b-b211ad4c7ea5@efficios.com> Date: Fri, 28 Apr 2023 20:50:34 -0400 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.9.0 Subject: Re: [GIT PULL] scheduler changes for v6.4 Content-Language: en-US To: Linus Torvalds , Ingo Molnar , Andrew Morton Cc: linux-kernel@vger.kernel.org, Peter Zijlstra , Thomas Gleixner , Borislav Petkov , Juri Lelli , Vincent Guittot , Dietmar Eggemann , Steven Rostedt , Ben Segall , Mel Gorman , Daniel Bristot de Oliveira , Valentin Schneider References: From: Mathieu Desnoyers In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 2023-04-28 18:02, Linus Torvalds wrote: > On Thu, Apr 27, 2023 at 1:51 PM Ingo Molnar 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