Hi all, Today's linux-next merge of the riscv-soc tree got a conflict in: MAINTAINERS between commit: 5ffe60d26107 ("drivers: firmware: add riscv SSE support") from the risc-v tree and commits: 66c6ceb41ed3 ("MAINTAINERS: rename Microchip RISC-V entry") 12cbb612fa1e ("MAINTAINERS: Setup support for Anlogic DR1V90 SoC tree") from the riscv-soc tree. Please keep the MAINTAINERS entries sorted ... 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 6e1aa69db0e1,867030aef2f5..000000000000 --- a/MAINTAINERS +++ b/MAINTAINERS @@@ -22124,6 -22055,6 +22124,14 @@@ F: Documentation/devicetree/bindings/ri F: Documentation/devicetree/bindings/timer/andestech,plmt0.yaml F: arch/riscv/boot/dts/andes/ ++RISC-V ANLOGIC SoC SUPPORT ++M: Conor Dooley ++T: git https://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git/ ++L: linux-riscv@lists.infradead.org ++S: Odd Fixes ++F: Documentation/devicetree/bindings/riscv/anlogic.yaml ++F: arch/riscv/boot/dts/anlogic/ ++ RISC-V ARCHITECTURE M: Paul Walmsley M: Palmer Dabbelt @@@ -22139,6 -22070,6 +22147,13 @@@ F: arch/riscv N: riscv K: riscv ++RISC-V FIRMWARE DRIVERS ++M: Conor Dooley ++L: linux-riscv@lists.infradead.org ++S: Maintained ++T: git git://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git ++F: drivers/firmware/riscv/* ++ RISC-V IOMMU M: Tomasz Jeznach L: iommu@lists.linux.dev @@@ -22148,14 -22079,15 +22163,7 @@@ T: git git://git.kernel.org/pub/scm/lin F: Documentation/devicetree/bindings/iommu/riscv,iommu.yaml F: drivers/iommu/riscv/ - RISC-V FIRMWARE DRIVERS -RISC-V ANLOGIC SoC SUPPORT --M: Conor Dooley -T: git https://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git/ --L: linux-riscv@lists.infradead.org - S: Maintained - T: git git://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git - F: drivers/firmware/riscv/* -S: Odd Fixes -F: Documentation/devicetree/bindings/riscv/anlogic.yaml -F: arch/riscv/boot/dts/anlogic/ -- - RISC-V MICROCHIP FPGA SUPPORT + RISC-V MICROCHIP SUPPORT M: Conor Dooley M: Daire McNamara L: linux-riscv@lists.infradead.org