linux-kernel - linux-next: manual merge of the risc-v tree with the arm-soc tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Message-ID: <20251126094511.07bdf834@canb.auug.org.au>
Date: Wed, 26 Nov 2025 09:45:11 +1100
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Palmer Dabbelt <palmer@...belt.com>, Paul Walmsley <paul@...an.com>,
 Arnd Bergmann <arnd@...db.de>
Cc: Clément Léger <cleger@...osinc.com>, Drew Fustini
 <dfustini@....tenstorrent.com>, Himanshu Chauhan
 <hchauhan@...tanamicro.com>, Lukas Bulwahn <lukas.bulwahn@...hat.com>, Paul
 Walmsley <pjw@...nel.org>, ARM <linux-arm-kernel@...ts.infradead.org>,
 Linux Kernel Mailing List <linux-kernel@...r.kernel.org>, Linux Next
 Mailing List <linux-next@...r.kernel.org>
Subject: linux-next: manual merge of the risc-v tree with the arm-soc tree

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@...osinc.com>
+ R:	Himanshu Chauhan <himanshu@...chauhan.dev>
+ L:	linux-riscv@...ts.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@....tenstorrent.com>
 +M:	Joel Stanley <jms@....tenstorrent.com>
 +L:	linux-riscv@...ts.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@...nel.org>
  M:	Guo Ren <guoren@...nel.org>

Content of type "application/pgp-signature" skipped