Re: mm-next: manual merge of the akpm/mm-unstable branch

["David Hildenbrand (Arm)" <david@kernel.org>]

On 10/2/26 10:15, Lorenzo Stoakes (ARM) wrote:
> On Fri, Oct 02, 2026 at 08:22:17AM +0200, David Hildenbrand (Arm) wrote:
>> Hi,
>>
>> today's mm-next merge of the akpm/mm-unstable branch tree got a conflict in:
>>
>>   arch/arm64/kvm/mmu.c
>>
>> between the commit:
>>
>>   71cc2c67fb8f KVM: arm64: Use stage-1 leaf size for VM_PFNMAP
>>
>> from Linus' tree and commits:
>>
>>   7a41ed87f53f mm: drop some redundant checks around hugetlb VMAs
>>   f09773c2c4d0 mm: rename is_vm_hugetlb_page() to vma_is_hugetlb()
>>
>> from the akpm/mm-unstable branch.
>>
>> I resolved the conflicts manually:
> 
> Nice to see this from mm-next :)
> 
> This looks the same as [0] and similar to that this LGTM.

Yes, there are some situations where we hit that in -next first and later (once
fixes go upstream) in mm-next. In other situations (primarily as we add new
material into mm-next when conflicting fixes are already upstream) we get the
conflicts only in mm-next.

All good dry runs for our incoming intra-mm conflicts that will be entirely in
mm-next :)

-- 
Cheers,

David