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

[Conor Dooley]

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: signature.asc
Description: PGP signature