From: "David Hildenbrand (Arm)" <david@kernel.org>
To: arang <jaewook376@gmail.com>, Mark Brown <broonie@kernel.org>
Cc: Andrew Morton <akpm@linux-foundation.org>,
Muchun Song <muchun.song@linux.dev>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: linux-next: manual merge of the mm-nonmm-unstable tree with the mm tree
Date: Tue, 15 Sep 2026 21:03:59 +0200 [thread overview]
Message-ID: <cbcaef6f-a7b3-4ada-aeba-b92308f855c2@kernel.org> (raw)
In-Reply-To: <CACXp-XqfPNgOU2=s0sDOUer9U9MXzwCVLZ1hK=tP8m-q_eNu3w@mail.gmail.com>
On 9/15/26 20:41, arang wrote:
> Hi Mark,
>
> Thanks for resolving the conflict.
>
> Adding David, since the conflicting commits are different revisions of
> the same fix. The latest public revision is v3:
>
> https://lore.kernel.org/linux-mm/20260914132352.472-1-jaewook376@gmail.com/
> <https://lore.kernel.org/linux-mm/20260914132352.472-1-jaewook376@gmail.com/>
>
> Following David's review, v3 renames remaining_size to
> offset_to_last_entry. David also provided:
>
> Acked-by: David Hildenbrand (Arm) <david@kernel.org <mailto:david@kernel.org>>
>
> The current linux-next merge result appears to retain remaining_size from
> the older revision. There is no functional difference, but please
> preserve the v3 offset_to_last_entry name and David's Ack in the final
> version.
It's a temporary glitch, because we have the mm-unstable tree coming into -next
in two differently dated versions. Tomorrow it should be resolved.
And we're discussing how to avoid that in the future :)
--
Cheers,
David
next prev parent reply other threads:[~2026-09-15 19:04 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-09-15 13:32 Mark Brown
[not found] ` <CACXp-XqfPNgOU2=s0sDOUer9U9MXzwCVLZ1hK=tP8m-q_eNu3w@mail.gmail.com>
2026-09-15 19:03 ` David Hildenbrand (Arm) [this message]
-- strict thread matches above, loose matches on Subject: below --
2026-09-15 13:32 Mark Brown
2026-09-15 13:32 Mark Brown
2026-09-15 17:54 ` Andrew Morton
2026-09-15 17:59 ` Mark Brown
2026-09-15 18:23 ` David Hildenbrand (Arm)
2026-09-15 18:41 ` Mark Brown
2026-09-02 10:18 Mark Brown
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=cbcaef6f-a7b3-4ada-aeba-b92308f855c2@kernel.org \
--to=david@kernel.org \
--cc=akpm@linux-foundation.org \
--cc=broonie@kernel.org \
--cc=jaewook376@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=muchun.song@linux.dev \
/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®