Linux MM tree latest commits
 help / color / mirror / Atom feed
From: "Lorenzo Stoakes (ARM)" <ljs@kernel.org>
To: "David Hildenbrand (Arm)" <david@kernel.org>
Cc: Andrew Morton <akpm@linux-foundation.org>,
	mm-commits@vger.kernel.org,  Paolo Bonzini <pbonzini@redhat.com>,
	Marc Zyngier <maz@kernel.org>, Oliver Upton <oupton@kernel.org>,
	 Zi Yan <ziy@nvidia.com>
Subject: Re: mm-next: manual merge of the akpm/mm-unstable branch
Date: Fri, 2 Oct 2026 09:15:39 +0100	[thread overview]
Message-ID: <ar9n7y0cnAoAEVkx@gremlin> (raw)
In-Reply-To: <75edc952-3ada-4875-b3a9-6338d6f4d36e@kernel.org>

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

  reply	other threads:[~2026-10-02  8:15 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-10-02  6:22 mm-next: manual merge of the akpm/mm-unstable branch David Hildenbrand (Arm)
2026-10-02  8:15 ` Lorenzo Stoakes (ARM) [this message]
2026-10-02 12:16   ` David Hildenbrand (Arm)
2026-10-02 12:24     ` Lorenzo Stoakes (ARM)
2026-10-02 23:22 ` Andrew Morton
  -- strict thread matches above, loose matches on Subject: below --
2026-11-20 11:42 David Hildenbrand (Arm)
2026-10-14  9:16 David Hildenbrand (Arm)
2026-09-22 19:17 David Hildenbrand (Arm)
2026-09-22 19:48 ` Andrew Morton

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=ar9n7y0cnAoAEVkx@gremlin \
    --to=ljs@kernel.org \
    --cc=akpm@linux-foundation.org \
    --cc=david@kernel.org \
    --cc=maz@kernel.org \
    --cc=mm-commits@vger.kernel.org \
    --cc=oupton@kernel.org \
    --cc=pbonzini@redhat.com \
    --cc=ziy@nvidia.com \
    /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