From: Andrew Morton <akpm@linux-foundation.org>
To: "David Hildenbrand (Arm)" <david@kernel.org>
Cc: mm-commits@vger.kernel.org
Subject: Re: mm-next: manual merge of the akpm/mm-unstable branch
Date: Tue, 22 Sep 2026 12:48:56 -0700 [thread overview]
Message-ID: <20260922124856.481e6c4b9be9a93e247acacd@linux-foundation.org> (raw)
In-Reply-To: <0eff7de9-b379-472b-a1c3-07b55758b389@kernel.org>
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.
next prev parent reply other threads:[~2026-09-22 19:48 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
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 [this message]
-- 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
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=20260922124856.481e6c4b9be9a93e247acacd@linux-foundation.org \
--to=akpm@linux-foundation.org \
--cc=david@kernel.org \
--cc=mm-commits@vger.kernel.org \
/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.