* Re: linux-next: manual merge of the risc-v tree with the tenstorrent-dt tree
[not found] <20251120102925.57ab2fe7@canb.auug.org.au>
@ 2025-11-19 23:54 ` Drew Fustini
0 siblings, 0 replies; only message in thread
From: Drew Fustini @ 2025-11-19 23:54 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Arnd Bergmann, soc, Palmer Dabbelt, Paul Walmsley, Joel Stanley,
Clément Léger, Drew Fustini, Himanshu Chauhan,
Linux Kernel Mailing List, Linux Next Mailing List, Paul Walmsley
[-- 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 --]
^ permalink raw reply [flat|nested] only message in thread