Re: linux-next: manual merge of the mm-nonmm-unstable tree with the mm tree

[David Hildenbrand (Arm)]

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@xxxxxxxxx/
> <https://lore.kernel.org/linux-mm/20260914132352.472-1-jaewook376@xxxxxxxxx/>
> 
> Following David's review, v3 renames remaining_size to
> offset_to_last_entry. David also provided:
> 
> Acked-by: David Hildenbrand (Arm) <david@xxxxxxxxxx <mailto:david@xxxxxxxxxx>>
> 
> 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