Hi all,
Today's linux-next merge of the crypto tree got a conflict in:
MAINTAINERS
between commit:
08b9a94e8654 ("soc: starfive: Add StarFive JH71XX pmu driver")
from the riscv-soc tree and commit:
c388f458bc34 ("hwrng: starfive - Add TRNG driver for StarFive SoC")
from the crypto 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.
Note, please keep MAINTAINERS file entries in alphabetical order.
--
Cheers,
Stephen Rothwell
diff --cc MAINTAINERS
index 3855c1b47e4b,4f59559597ab..000000000000
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@ -19771,19 -19905,12 +19771,25 @@@ F: Documentation/devicetree/bindings/re
F: drivers/reset/reset-starfive-jh7100.c
F: include/dt-bindings/reset/starfive-jh7100.h
+STARFIVE SOC DRIVERS
+M: Conor Dooley <[email protected]>
+S: Maintained
+T: git https://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git/
+F: drivers/soc/starfive/
+
+STARFIVE JH71XX PMU CONTROLLER DRIVER
+M: Walker Chen <[email protected]>
+S: Supported
+F: Documentation/devicetree/bindings/power/starfive*
+F: drivers/soc/starfive/jh71xx_pmu.c
+F: include/dt-bindings/power/starfive,jh7110-pmu.h
+
+ STARFIVE TRNG DRIVER
+ M: Jia Jie Ho <[email protected]>
+ S: Supported
+ F: Documentation/devicetree/bindings/rng/starfive*
+ F: drivers/char/hw_random/starfive-trng.c
+
STATIC BRANCH/CALL
M: Peter Zijlstra <[email protected]>
M: Josh Poimboeuf <[email protected]>
On Mon, Jan 30, 2023 at 11:41:28AM +1100, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the crypto tree got a conflict in:
>
> MAINTAINERS
>
> between commit:
>
> 08b9a94e8654 ("soc: starfive: Add StarFive JH71XX pmu driver")
>
> from the riscv-soc tree and commit:
>
> c388f458bc34 ("hwrng: starfive - Add TRNG driver for StarFive SoC")
>
> from the crypto tree.
> Note, please keep MAINTAINERS file entries in alphabetical order.
Huh, good point. I didn't notice the PMU entry was added out of order.
> 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.
Thanks Stephen