From: Conor Dooley <conor@kernel.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: "Conor Dooley" <Conor.Dooley@microchip.com>,
"Palmer Dabbelt" <palmer@dabbelt.com>,
"Paul Walmsley" <paul@pwsan.com>,
"Clément Léger" <cleger@rivosinc.com>,
"Himanshu Chauhan" <hchauhan@ventanamicro.com>,
"Linux Kernel Mailing List" <linux-kernel@vger.kernel.org>,
"Linux Next Mailing List" <linux-next@vger.kernel.org>,
"Paul Walmsley" <pjw@kernel.org>
Subject: Re: linux-next: manual merge of the riscv-soc tree with the risc-v tree
Date: Thu, 20 Nov 2025 09:46:59 +0000 [thread overview]
Message-ID: <20251120-entertain-enchilada-9cd85691584b@spud> (raw)
In-Reply-To: <20251120103737.5349662e@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 571 bytes --]
On Thu, Nov 20, 2025 at 10:37:37AM +1100, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the riscv-soc tree got a conflict in:
>
> MAINTAINERS
>
> between commit:
>
> 5ffe60d26107 ("drivers: firmware: add riscv SSE support")
>
> from the risc-v tree and commits:
>
> 66c6ceb41ed3 ("MAINTAINERS: rename Microchip RISC-V entry")
> 12cbb612fa1e ("MAINTAINERS: Setup support for Anlogic DR1V90 SoC tree")
>
> from the riscv-soc tree.
>
> Please keep the MAINTAINERS entries sorted ...
Whoops, I'll get that fixed up..
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 228 bytes --]
prev parent reply other threads:[~2025-11-20 9:47 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-11-19 23:37 linux-next: manual merge of the riscv-soc tree with the risc-v tree Stephen Rothwell
2025-11-20 9:46 ` Conor Dooley [this message]
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=20251120-entertain-enchilada-9cd85691584b@spud \
--to=conor@kernel.org \
--cc=Conor.Dooley@microchip.com \
--cc=cleger@rivosinc.com \
--cc=hchauhan@ventanamicro.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=palmer@dabbelt.com \
--cc=paul@pwsan.com \
--cc=pjw@kernel.org \
--cc=sfr@canb.auug.org.au \
/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