* mm-next: manual merge of the akpm/mm-unstable branch
@ 2026-09-22 19:17 David Hildenbrand (Arm)
2026-09-22 19:48 ` Andrew Morton
0 siblings, 1 reply; 7+ messages in thread
From: David Hildenbrand (Arm) @ 2026-09-22 19:17 UTC (permalink / raw)
To: Andrew Morton; +Cc: mm-commits
Hi,
today's (well, and the last couple of days) mm-next merge of the
akpm/mm-unstable branch tree got a conflict in:
drivers/infiniband/hw/hfi1/file_ops.c
between the commit:
62f0f34fbd2b ("IB/hfi1: Fix the PIO_CRED credit-return mmap")
from Linus' tree and commit:
e7d9f14bb73b ("infiniband: update hfi1 to use remap_vmalloc_range()")
from the akpm/mm-unstable branch.
I resolved the conflicts manually:
diff --cc drivers/infiniband/hw/hfi1/file_ops.c
index 1a36f995c4f6,b02d1f1dbb27..680364fda856
--- a/drivers/infiniband/hw/hfi1/file_ops.c
+++ b/drivers/infiniband/hw/hfi1/file_ops.c
@@@ -325,8 -320,7 +320,8 @@@ static int hfi1_file_mmap(struct file *
memaddr = 0;
void *memvirt = NULL;
dma_addr_t memdma = 0;
- u8 subctxt, mapio = 0, vmf = 0, type;
+ u8 subctxt, mapio = 0, is_vmalloc = 0, type;
+ size_t memdmalen = 0;
ssize_t memlen = 0;
int ret = 0;
u16 ctxt;
@@@ -569,16 -546,13 +556,14 @@@
}
vm_flags_reset(vma, flags);
- mmap_cdbg(ctxt, subctxt, type, mapio, vmf, memaddr, memvirt, memdma,
+ mmap_cdbg(ctxt, subctxt, type, mapio, is_vmalloc, memaddr, memvirt, memdma,
memlen, vma);
- if (vmf) {
- vma->vm_pgoff = PFN_DOWN(memaddr);
- vma->vm_ops = &vm_ops;
- ret = 0;
+ if (is_vmalloc) {
+ ret = remap_vmalloc_range(vma, memvirt, 0);
} else if (memdma) {
ret = dma_mmap_coherent(&dd->pcidev->dev, vma,
- memvirt, memdma, memlen);
+ memvirt, memdma,
+ memdmalen ? memdmalen : memlen);
} else if (mapio) {
ret = io_remap_pfn_range(vma, vma->vm_start,
PFN_DOWN(memaddr),
--
Cheers,
David
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: mm-next: manual merge of the akpm/mm-unstable branch
2026-09-22 19:17 mm-next: manual merge of the akpm/mm-unstable branch David Hildenbrand (Arm)
@ 2026-09-22 19:48 ` Andrew Morton
0 siblings, 0 replies; 7+ messages in thread
From: Andrew Morton @ 2026-09-22 19:48 UTC (permalink / raw)
To: David Hildenbrand (Arm); +Cc: mm-commits
On Tue, 22 Sep 2026 21:17:56 +0200 "David Hildenbrand (Arm)" <david@kernel.org> wrote:
> Hi,
>
> today's (well, and the last couple of days) mm-next merge of the
> akpm/mm-unstable branch tree got a conflict in:
>
> drivers/infiniband/hw/hfi1/file_ops.c
>
> between the commit:
>
> 62f0f34fbd2b ("IB/hfi1: Fix the PIO_CRED credit-return mmap")
>
> from Linus' tree and commit:
>
> e7d9f14bb73b ("infiniband: update hfi1 to use remap_vmalloc_range()")
>
> from the akpm/mm-unstable branch.
>
Thanks, I've now resynced with Linus and fixed that up.
^ permalink raw reply [flat|nested] 7+ messages in thread
* mm-next: manual merge of the akpm/mm-unstable branch
@ 2026-10-02 6:22 David Hildenbrand (Arm)
2026-10-02 8:15 ` Lorenzo Stoakes (ARM)
2026-10-02 23:22 ` Andrew Morton
0 siblings, 2 replies; 7+ messages in thread
From: David Hildenbrand (Arm) @ 2026-10-02 6:22 UTC (permalink / raw)
To: Andrew Morton
Cc: mm-commits, Paolo Bonzini, Lorenzo Stoakes (Arm), Marc Zyngier,
Oliver Upton, Zi Yan
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:
diff --cc arch/arm64/kvm/mmu.c
index bf6d6526639f,73c8492e85c4..b0ea1a9391da
--- a/arch/arm64/kvm/mmu.c
+++ b/arch/arm64/kvm/mmu.c
@@@ -1468,11 -1468,30 +1468,11 @@@ transparent_hugepage_adjust(struct kvm
return PAGE_SIZE;
}
-static int get_vma_page_shift(struct vm_area_struct *vma, unsigned long hva)
+static int get_vma_page_shift(struct vm_area_struct *vma)
{
- if (is_vm_hugetlb_page(vma))
- unsigned long pa;
-
+ if (vma_is_hugetlb(vma))
return huge_page_shift(hstate_vma(vma));
- if (!(vma->vm_flags & VM_PFNMAP))
- return PAGE_SHIFT;
-
- pa = (vma->vm_pgoff << PAGE_SHIFT) + (hva - vma->vm_start);
-
-#ifndef __PAGETABLE_PMD_FOLDED
- if ((hva & (PUD_SIZE - 1)) == (pa & (PUD_SIZE - 1)) &&
- ALIGN_DOWN(hva, PUD_SIZE) >= vma->vm_start &&
- ALIGN(hva, PUD_SIZE) <= vma->vm_end)
- return PUD_SHIFT;
-#endif
-
- if ((hva & (PMD_SIZE - 1)) == (pa & (PMD_SIZE - 1)) &&
- ALIGN_DOWN(hva, PMD_SIZE) >= vma->vm_start &&
- ALIGN(hva, PMD_SIZE) <= vma->vm_end)
- return PMD_SHIFT;
-
return PAGE_SHIFT;
}
--
Cheers,
David
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: mm-next: manual merge of the akpm/mm-unstable branch
2026-10-02 6:22 David Hildenbrand (Arm)
@ 2026-10-02 8:15 ` Lorenzo Stoakes (ARM)
2026-10-02 12:16 ` David Hildenbrand (Arm)
2026-10-02 23:22 ` Andrew Morton
1 sibling, 1 reply; 7+ messages in thread
From: Lorenzo Stoakes (ARM) @ 2026-10-02 8:15 UTC (permalink / raw)
To: David Hildenbrand (Arm)
Cc: Andrew Morton, mm-commits, Paolo Bonzini, Marc Zyngier,
Oliver Upton, Zi Yan
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.
[0]:https://lore.kernel.org/all/ar5ZsSo2ybT39BEQ@sirena.org.uk/
>
>
> diff --cc arch/arm64/kvm/mmu.c
> index bf6d6526639f,73c8492e85c4..b0ea1a9391da
> --- a/arch/arm64/kvm/mmu.c
> +++ b/arch/arm64/kvm/mmu.c
> @@@ -1468,11 -1468,30 +1468,11 @@@ transparent_hugepage_adjust(struct kvm
> return PAGE_SIZE;
> }
>
> -static int get_vma_page_shift(struct vm_area_struct *vma, unsigned long hva)
> +static int get_vma_page_shift(struct vm_area_struct *vma)
> {
> - if (is_vm_hugetlb_page(vma))
> - unsigned long pa;
> -
> + if (vma_is_hugetlb(vma))
> return huge_page_shift(hstate_vma(vma));
>
> - if (!(vma->vm_flags & VM_PFNMAP))
> - return PAGE_SHIFT;
> -
> - pa = (vma->vm_pgoff << PAGE_SHIFT) + (hva - vma->vm_start);
> -
> -#ifndef __PAGETABLE_PMD_FOLDED
> - if ((hva & (PUD_SIZE - 1)) == (pa & (PUD_SIZE - 1)) &&
> - ALIGN_DOWN(hva, PUD_SIZE) >= vma->vm_start &&
> - ALIGN(hva, PUD_SIZE) <= vma->vm_end)
> - return PUD_SHIFT;
> -#endif
> -
> - if ((hva & (PMD_SIZE - 1)) == (pa & (PMD_SIZE - 1)) &&
> - ALIGN_DOWN(hva, PMD_SIZE) >= vma->vm_start &&
> - ALIGN(hva, PMD_SIZE) <= vma->vm_end)
> - return PMD_SHIFT;
> -
> return PAGE_SHIFT;
> }
>
> --
> Cheers,
>
> David
>
--
Cheers, Lorenzo
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: mm-next: manual merge of the akpm/mm-unstable branch
2026-10-02 8:15 ` Lorenzo Stoakes (ARM)
@ 2026-10-02 12:16 ` David Hildenbrand (Arm)
2026-10-02 12:24 ` Lorenzo Stoakes (ARM)
0 siblings, 1 reply; 7+ messages in thread
From: David Hildenbrand (Arm) @ 2026-10-02 12:16 UTC (permalink / raw)
To: Lorenzo Stoakes (ARM)
Cc: Andrew Morton, mm-commits, Paolo Bonzini, Marc Zyngier,
Oliver Upton, Zi Yan
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
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: mm-next: manual merge of the akpm/mm-unstable branch
2026-10-02 12:16 ` David Hildenbrand (Arm)
@ 2026-10-02 12:24 ` Lorenzo Stoakes (ARM)
0 siblings, 0 replies; 7+ messages in thread
From: Lorenzo Stoakes (ARM) @ 2026-10-02 12:24 UTC (permalink / raw)
To: David Hildenbrand (Arm)
Cc: Andrew Morton, mm-commits, Paolo Bonzini, Marc Zyngier,
Oliver Upton, Zi Yan
On Fri, Oct 02, 2026 at 02:16:14PM +0200, David Hildenbrand (Arm) wrote:
> 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 :)
Yes love to see it! <3
>
> --
> Cheers,
>
> David
--
Cheers, Lorenzo
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: mm-next: manual merge of the akpm/mm-unstable branch
2026-10-02 6:22 David Hildenbrand (Arm)
2026-10-02 8:15 ` Lorenzo Stoakes (ARM)
@ 2026-10-02 23:22 ` Andrew Morton
1 sibling, 0 replies; 7+ messages in thread
From: Andrew Morton @ 2026-10-02 23:22 UTC (permalink / raw)
To: David Hildenbrand (Arm)
Cc: mm-commits, Paolo Bonzini, Lorenzo Stoakes (Arm), Marc Zyngier,
Oliver Upton, Zi Yan
On Fri, 2 Oct 2026 08:22:17 +0200 "David Hildenbrand (Arm)" <david@kernel.org> 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:
Thanks. I rebased mm.git on latest Linus (ff47652a4b66) and fixed this
up (check my handiwork!), so that should go away.
I'll attempt to make ff47652a4b66 the base for the next merge window.
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2026-10-02 23:22 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2026-09-22 19:17 mm-next: manual merge of the akpm/mm-unstable branch David Hildenbrand (Arm)
2026-09-22 19:48 ` Andrew Morton
-- strict thread matches above, loose matches on Subject: below --
2026-10-02 6:22 David Hildenbrand (Arm)
2026-10-02 8:15 ` Lorenzo Stoakes (ARM)
2026-10-02 12:16 ` David Hildenbrand (Arm)
2026-10-02 12:24 ` Lorenzo Stoakes (ARM)
2026-10-02 23:22 ` Andrew Morton
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.