Subject: linux-next: manual merge of the risc-v tree with the tenstorrent-dt tree

From: Stephen Rothwell <[email-masked]>
Date: Thu, 20 Nov 2025 10:29:25 +1100

Hi all,

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

  MAINTAINERS

between commits:

  4de28f1edcfb ("dt-bindings: riscv: Add Tenstorrent Blackhole compatible")
  8e88602e99a7 ("riscv: dts: Add Tenstorrent Blackhole SoC PCIe cards")

from the tenstorrent-dt tree and commit:

  5ffe60d26107 ("drivers: firmware: add riscv SSE support")

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 079c43e56dc6,0e3e9d8ab5b4..000000000000
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@ -22227,15 -22195,14 +22234,23 @@@ F:	arch/riscv/boot/dts/spacemit
  N:	spacemit
  K:	spacemit
  
+ RISC-V SSE DRIVER
+ M:	Clément Léger <[email-masked]>
+ R:	Himanshu Chauhan <[email-masked]>
+ L:	[email-masked]
+ S:	Maintained
+ F:	drivers/firmware/riscv/riscv_sse.c
+ F:	include/linux/riscv_sse.h
+ 
 +RISC-V TENSTORRENT SoC SUPPORT
 +M:	Drew Fustini <[email-masked]>
 +M:	Joel Stanley <[email-masked]>
 +L:	[email-masked]
 +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 <[email-masked]>
  M:	Guo Ren <[email-masked]>