From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Catalin Marinas <catalin.marinas@arm•com>,
Will Deacon <will@kernel•org>,
"Cc: Andrew Morton" <akpm@linux-foundation•org>
Cc: Anshuman Khandual <anshuman.khandual@arm•com>,
Chaitanya S Prakash <chaitanyas.prakash@arm•com>,
Linu Cherian <linu.cherian@arm•com>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>
Subject: linux-next: manual merge of the arm64 tree with the mm-unstable tree
Date: Fri, 14 Nov 2025 11:21:44 +1100 [thread overview]
Message-ID: <20251114112144.366698c7@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 860 bytes --]
Hi all,
Today's linux-next merge of the arm64 tree got a conflict in:
arch/arm64/mm/mmu.c
between commit:
2b9cdb805fcd ("mm: make INVALID_PHYS_ADDR a generic macro")
from the mm-unstable tree and commit:
bfc184cb1ba7 ("arm64/mm: Allow __create_pgd_mapping() to propagate pgtable_alloc() errors")
from the arm64 tree.
I fixed it up (the latter moved the INVALID_PHYS_ADDR define so I removed
it from its new place, and there was no conflict left) and can carry the
fix as necessary. This is now fixed as far as linux-next is concerned,
but any non trivial conflicts should be mentioned to your upstream
maintainer when your tree is submitted for merging. You may also want
to consider cooperating with the maintainer of the conflicting tree to
minimise any particularly complex conflicts.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2025-11-14 0:21 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-11-14 0:21 Stephen Rothwell [this message]
2025-12-04 2:00 ` linux-next: manual merge of the arm64 tree with the mm-unstable tree Stephen Rothwell
2025-12-04 3:25 ` Anshuman Khandual
2025-12-04 5:56 ` Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2025-11-19 23:25 Stephen Rothwell
2025-11-20 1:36 ` Huang, Ying
2025-12-04 2:02 ` Stephen Rothwell
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=20251114112144.366698c7@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=akpm@linux-foundation$(echo .)org \
--cc=anshuman.khandual@arm$(echo .)com \
--cc=catalin.marinas@arm$(echo .)com \
--cc=chaitanyas.prakash@arm$(echo .)com \
--cc=linu.cherian@arm$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=will@kernel$(echo .)org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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