linux-kernel - Re: linux-next: manual merge of the riscv-soc tree with the risc-v tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <20251120-entertain-enchilada-9cd85691584b@spud>
Date: Thu, 20 Nov 2025 09:46:59 +0000
From: Conor Dooley <conor@...nel.org>
To: Stephen Rothwell <sfr@...b.auug.org.au>
Cc: Conor Dooley <Conor.Dooley@...rochip.com>,
	Palmer Dabbelt <palmer@...belt.com>, Paul Walmsley <paul@...an.com>,
	Clément Léger <cleger@...osinc.com>,
	Himanshu Chauhan <hchauhan@...tanamicro.com>,
	Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
	Linux Next Mailing List <linux-next@...r.kernel.org>,
	Paul Walmsley <pjw@...nel.org>
Subject: Re: linux-next: manual merge of the riscv-soc tree with the risc-v
 tree

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..

Download attachment "signature.asc" of type "application/pgp-signature" (229 bytes)