Hi all,

Today's linux-next merge of the risc-v tree got a conflict in:

  MAINTAINERS

between commit:

  4de28f1edcfb ("dt-bindings: riscv: Add Tenstorrent Blackhole compatible")

from the arm-soc tree and commits:

  e0ce62cfe3a9 ("drivers: firmware: add riscv SSE support")
  832fd6c2e55c ("MAINTAINERS: refer to intended files in RISC-V SSE DRIVER")

from the risc-v 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 MAINTAINERS
index aacd4a754dab,6fa1048c248a..000000000000
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@ -22247,15 -22195,14 +22254,23 @@@ F:	arch/riscv/boot/dts/spacemit
  N:	spacemit
  K:	spacemit
  
+ RISC-V SSE DRIVER
+ M:	Clément Léger <cleger@rivosinc.com>
+ R:	Himanshu Chauhan <himanshu@thechauhan.dev>
+ L:	linux-riscv@lists.infradead.org
+ S:	Maintained
+ F:	drivers/firmware/riscv/riscv_sbi_sse.c
+ F:	include/linux/riscv_sbi_sse.h
+ 
 +RISC-V TENSTORRENT SoC SUPPORT
 +M:	Drew Fustini <dfustini@oss.tenstorrent.com>
 +M:	Joel Stanley <jms@oss.tenstorrent.com>
 +L:	linux-riscv@lists.infradead.org
 +S:	Maintained
 +T:	git https://github.com/tenstorrent/linux.git
 +F:	Documentation/devicetree/bindings/riscv/tenstorrent.yaml
 +F:	arch/riscv/boot/dts/tenstorrent/
 +
  RISC-V THEAD SoC SUPPORT
  M:	Drew Fustini <fustini@kernel.org>
  M:	Guo Ren <guoren@kernel.org>

On Wed, Nov 26, 2025 at 09:45:11AM +1100, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the risc-v tree got a conflict in:
> 
>   MAINTAINERS
> 
> between commit:
> 
>   4de28f1edcfb ("dt-bindings: riscv: Add Tenstorrent Blackhole compatible")
> 
> from the arm-soc tree and commits:
> 
>   e0ce62cfe3a9 ("drivers: firmware: add riscv SSE support")
>   832fd6c2e55c ("MAINTAINERS: refer to intended files in RISC-V SSE DRIVER")
> 
> from the risc-v 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 MAINTAINERS
> index aacd4a754dab,6fa1048c248a..000000000000
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@@ -22247,15 -22195,14 +22254,23 @@@ F:	arch/riscv/boot/dts/spacemit
>   N:	spacemit
>   K:	spacemit
>   
> + RISC-V SSE DRIVER
> + M:	Clément Léger <cleger@rivosinc.com>
> + R:	Himanshu Chauhan <himanshu@thechauhan.dev>
> + L:	linux-riscv@lists.infradead.org
> + S:	Maintained
> + F:	drivers/firmware/riscv/riscv_sbi_sse.c
> + F:	include/linux/riscv_sbi_sse.h
> + 
>  +RISC-V TENSTORRENT SoC SUPPORT
>  +M:	Drew Fustini <dfustini@oss.tenstorrent.com>
>  +M:	Joel Stanley <jms@oss.tenstorrent.com>
>  +L:	linux-riscv@lists.infradead.org
>  +S:	Maintained
>  +T:	git https://github.com/tenstorrent/linux.git
>  +F:	Documentation/devicetree/bindings/riscv/tenstorrent.yaml
>  +F:	arch/riscv/boot/dts/tenstorrent/
>  +
>   RISC-V THEAD SoC SUPPORT
>   M:	Drew Fustini <fustini@kernel.org>
>   M:	Guo Ren <guoren@kernel.org>

Thanks for fixing this up. It looks like the correct resolution to me.

Tenstorrent MAINTAINERS patch is in the tag tenstorrent-dt-for-v6.19 [1]
that I used for the 6.19 pull request [2].

Drew

[1] https://git.kernel.org/pub/scm/linux/kernel/git/tenstorrent/linux.git/tag/?h=tenstorrent-dt-for-v6.19
[2] https://lore.kernel.org/all/aPUemXdOFZEdkayE@x1/