mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
To: Linus Torvalds <torvalds@linux-foundation.org>,
	Ingo Molnar <mingo@kernel.org>,
	Andrew Morton <akpm@linux-foundation.org>
Cc: linux-kernel@vger.kernel.org,
	Peter Zijlstra <peterz@infradead.org>,
	Thomas Gleixner <tglx@linutronix.de>,
	Borislav Petkov <bp@alien8.de>,
	Juri Lelli <juri.lelli@redhat.com>,
	Vincent Guittot <vincent.guittot@linaro.org>,
	Dietmar Eggemann <dietmar.eggemann@arm.com>,
	Steven Rostedt <rostedt@goodmis.org>,
	Ben Segall <bsegall@google.com>, Mel Gorman <mgorman@suse.de>,
	Daniel Bristot de Oliveira <bristot@redhat.com>,
	Valentin Schneider <vschneid@redhat.com>
Subject: Re: [GIT PULL] scheduler changes for v6.4
Date: Fri, 28 Apr 2023 20:50:34 -0400	[thread overview]
Message-ID: <3f452ee7-6430-e7a9-590b-b211ad4c7ea5@efficios.com> (raw)
In-Reply-To: <CAHk-=wj-t1N7a2dH=y7MCjctk_Zw77C8_V6cfS-UC7f3jXAF6g@mail.gmail.com>

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


  reply	other threads:[~2023-04-29  0:50 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-04-27 20:51 Ingo Molnar
2023-04-28 22:02 ` Linus Torvalds
2023-04-29  0:50   ` Mathieu Desnoyers [this message]
2023-04-29  7:03     ` Ingo Molnar
2023-04-28 22:04 ` pr-tracker-bot

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=3f452ee7-6430-e7a9-590b-b211ad4c7ea5@efficios.com \
    --to=mathieu.desnoyers@efficios.com \
    --cc=akpm@linux-foundation.org \
    --cc=bp@alien8.de \
    --cc=bristot@redhat.com \
    --cc=bsegall@google.com \
    --cc=dietmar.eggemann@arm.com \
    --cc=juri.lelli@redhat.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mgorman@suse.de \
    --cc=mingo@kernel.org \
    --cc=peterz@infradead.org \
    --cc=rostedt@goodmis.org \
    --cc=tglx@linutronix.de \
    --cc=torvalds@linux-foundation.org \
    --cc=vincent.guittot@linaro.org \
    --cc=vschneid@redhat.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®