From: "Gowans, James" <jgowans@amazon.com>
To: "broonie@kernel.org" <broonie@kernel.org>
Cc: "linux-next@vger.kernel.org" <linux-next@vger.kernel.org>,
"jbeulich@suse.com" <jbeulich@suse.com>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
"rppt@kernel.org" <rppt@kernel.org>
Subject: Re: linux-next: manual merge of the memblock tree with the origin tree
Date: Fri, 21 Jun 2024 20:08:53 +0000 [thread overview]
Message-ID: <9262bfba5d65c603dcad49a75e5a30564f75c3d4.camel@amazon.com> (raw)
In-Reply-To: <44ce3730-8e4d-42f9-8b17-104805e46f93@sirena.org.uk>
Hi Mark,
On Thu, 2024-06-20 at 19:00 +0100, Mark Brown wrote:
> On Thu, Jun 20, 2024 at 05:59:05PM +0000, Gowans, James wrote:
>
> > Correct me if I'm wrong, but it looks like the if statement only got
> > deleted and not moved, so this would need to be re-worked.
>
> Yes, the merge in -next is wrong.
What's the next step to fix the incorrect merge commit?
Looking at today's -next I see the same issue:
https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git/commit/mm/memblock.c?h=next-20240621&id=f689ee4c062317a0831fbffeeb30d7816608b2e7
JG
next prev parent reply other threads:[~2024-06-21 20:08 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-06-20 15:54 linux-next: manual merge of the memblock tree with the origin tree Mark Brown
2024-06-20 16:07 ` Gowans, James
2024-06-20 16:13 ` Mark Brown
2024-06-20 17:59 ` Gowans, James
2024-06-20 18:00 ` Mark Brown
2024-06-21 20:08 ` Gowans, James [this message]
2024-06-21 20:30 ` Mark Brown
2024-06-24 5:53 ` Mike Rapoport
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=9262bfba5d65c603dcad49a75e5a30564f75c3d4.camel@amazon.com \
--to=jgowans@amazon.com \
--cc=broonie@kernel.org \
--cc=jbeulich@suse.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=rppt@kernel.org \
/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;
as well as URLs for NNTP newsgroup(s).