From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Andrew Morton <akpm@linux-foundation•org>,
Palmer Dabbelt <palmer@dabbelt•com>,
Paul Walmsley <paul.walmsley@sifive•com>
Cc: "Drew Fustini" <fustini@kernel•org>,
"Duje Mihanović" <duje@dujemihanovic•xyz>,
"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 mm-unstable tree with the risc-v-fixes tree
Date: Mon, 23 Jun 2025 10:14:07 +1000 [thread overview]
Message-ID: <20250623101407.4fe17973@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1342 bytes --]
Hi all,
Today's linux-next merge of the mm-unstable tree got a conflict in:
.mailmap
between commit:
850f0e2433cd ("MAINTAINERS: Update Drew Fustini's email address")
from the risc-v-fixes tree and commit:
a5d3f8d805d2 ("mailmap: update Duje Mihanović's email address")
from the mm-unstable tree.
I fixed it up (see below) 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
diff --cc .mailmap
index 93e94b0b9376,60165a8144bd..000000000000
--- a/.mailmap
+++ b/.mailmap
@@@ -223,7 -222,7 +223,8 @@@ Dmitry Safonov <0x7f454c46@gmail•com> <
Dmitry Safonov <0x7f454c46@gmail•com> <dsafonov@virtuozzo•com>
Domen Puncer <domen@coderock•org>
Douglas Gilbert <dougg@torque•net>
+Drew Fustini <fustini@kernel•org> <drew@pdp7•com>
+ <duje@dujemihanovic•xyz> <duje.mihanovic@skole•hr>
Ed L. Cashin <ecashin@coraid•com>
Elliot Berman <quic_eberman@quicinc•com> <eberman@codeaurora•org>
Enric Balletbo i Serra <eballetbo@kernel•org> <enric.balletbo@collabora•com>
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2025-06-23 0:14 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-06-23 0:14 Stephen Rothwell [this message]
2025-06-24 0:08 ` linux-next: manual merge of the mm-unstable tree with the risc-v-fixes tree Stephen Rothwell
2025-06-24 0:10 ` Palmer Dabbelt
2025-06-24 0:20 ` 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=20250623101407.4fe17973@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=akpm@linux-foundation$(echo .)org \
--cc=duje@dujemihanovic$(echo .)xyz \
--cc=fustini@kernel$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=palmer@dabbelt$(echo .)com \
--cc=paul.walmsley@sifive$(echo .)com \
/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