Hi all, Today's linux-next merge of the mmc tree got a conflict in: MAINTAINERS between commits: 08b9a94e8654 ("soc: starfive: Add StarFive JH71XX pmu driver") c388f458bc34 ("hwrng: starfive - Add TRNG driver for StarFive SoC") from the arm-soc, crypto trees and commit: bfde6b3869f5 ("mmc: starfive: Add sdio/emmc driver support") from the mmc 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 9262a1d7203d,71355c68a237..000000000000 --- a/MAINTAINERS +++ b/MAINTAINERS @@@ -19840,25 -19926,12 +19840,31 @@@ F: Documentation/devicetree/bindings/re F: drivers/reset/reset-starfive-jh7100.c F: include/dt-bindings/reset/starfive-jh7100.h + STARFIVE JH7110 MMC/SD/SDIO DRIVER + M: William Qiu <william.qiu@xxxxxxxxxxxxxxxx> + S: Maintained + F: Documentation/devicetree/bindings/mmc/starfive* + F: drivers/mmc/dw_mmc-starfive.c + +STARFIVE JH71XX PMU CONTROLLER DRIVER +M: Walker Chen <walker.chen@xxxxxxxxxxxxxxxx> +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 SOC DRIVERS +M: Conor Dooley <conor@xxxxxxxxxx> +S: Maintained +T: git https://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git/ +F: drivers/soc/starfive/ + +STARFIVE TRNG DRIVER +M: Jia Jie Ho <jiajie.ho@xxxxxxxxxxxxxxxx> +S: Supported +F: Documentation/devicetree/bindings/rng/starfive* +F: drivers/char/hw_random/jh7110-trng.c + STATIC BRANCH/CALL M: Peter Zijlstra <peterz@xxxxxxxxxxxxx> M: Josh Poimboeuf <jpoimboe@xxxxxxxxxx>
Attachment:
pgp3yLFzLa_Pf.pgp
Description: OpenPGP digital signature