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

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1711 bytes --]

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 <cleger@rivosinc.com>
+ R:	Himanshu Chauhan <himanshu@thechauhan.dev>
+ L:	linux-riscv@lists.infradead.org
+ S:	Maintained
+ F:	drivers/firmware/riscv/riscv_sse.c
+ F:	include/linux/riscv_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>

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

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

[Drew Fustini]

[-- Attachment #1: Type: text/plain, Size: 1242 bytes --]

On Thu, Nov 20, 2025 at 10:29:25AM +1100, Stephen Rothwell wrote:
> 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.

Thank you for fixing it up. The resolution looks correct to me. The
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/fustini/linux.git/tag/?h=tenstorrent-dt-for-v6.19
[2] https://lore.kernel.org/all/aPUemXdOFZEdkayE@x1/

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 228 bytes --]