All of lore.kernel.org
 help / color / mirror / Atom feed
From: Andrew Morton <akpm@linux-foundation.org>
To: "David Hildenbrand (Arm)" <david@kernel.org>
Cc: mm-commits@vger.kernel.org, Paolo Bonzini <pbonzini@redhat.com>,
	"Lorenzo Stoakes (Arm)" <ljs@kernel.org>,
	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 16:22:00 -0700	[thread overview]
Message-ID: <20261002162200.cb415c8a3310d6f7578d1930@linux-foundation.org> (raw)
In-Reply-To: <75edc952-3ada-4875-b3a9-6338d6f4d36e@kernel.org>

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.

  parent reply	other threads:[~2026-10-02 23:22 UTC|newest]

Thread overview: 7+ 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)
2026-10-02 12:16   ` David Hildenbrand (Arm)
2026-10-02 12:24     ` Lorenzo Stoakes (ARM)
2026-10-02 23:22 ` Andrew Morton [this message]
  -- strict thread matches above, loose matches on Subject: below --
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=20261002162200.cb415c8a3310d6f7578d1930@linux-foundation.org \
    --to=akpm@linux-foundation.org \
    --cc=david@kernel.org \
    --cc=ljs@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 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.