Hi all,
On Thu, 16 Feb 2023 12:40:04 +1100 Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
>
> Today's linux-next merge of the pinctrl tree got a conflict in:
>
> MAINTAINERS
>
> between commit:
>
> 9e622229bbf4 ("mmc: starfive: Add sdio/emmc driver support")
>
> from the mmc tree and commit:
>
> d6e0a660097d ("dt-bindings: pinctrl: Add StarFive JH7110 sys pinctrl")
>
> from the pinctrl 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 1208b0380fa5,8a851eb053ca..000000000000
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@@ -19914,19 -19890,15 +19914,21 @@@ F: Documentation/devicetree/bindings/cl
> F: drivers/clk/starfive/clk-starfive-jh7100*
> F: include/dt-bindings/clock/starfive-jh7100*.h
>
> +STARFIVE JH7110 MMC/SD/SDIO DRIVER
> +M: William Qiu <william.qiu@xxxxxxxxxxxxxxxx>
> +S: Supported
> +F: Documentation/devicetree/bindings/mmc/starfive*
> +F: drivers/mmc/host/dw_mmc-starfive.c
> +
> - STARFIVE JH7100 PINCTRL DRIVER
> + STARFIVE JH71X0 PINCTRL DRIVERS
> M: Emil Renner Berthing <kernel@xxxxxxxx>
> + M: Jianlong Huang <jianlong.huang@xxxxxxxxxxxxxxxx>
> L: linux-gpio@xxxxxxxxxxxxxxx
> S: Maintained
> - F: Documentation/devicetree/bindings/pinctrl/starfive,jh7100-pinctrl.yaml
> - F: drivers/pinctrl/starfive/
> + F: Documentation/devicetree/bindings/pinctrl/starfive,jh71*.yaml
> + F: drivers/pinctrl/starfive/pinctrl-starfive-jh71*
> F: include/dt-bindings/pinctrl/pinctrl-starfive-jh7100.h
> + F: include/dt-bindings/pinctrl/starfive,jh7110-pinctrl.h
>
> STARFIVE JH7100 RESET CONTROLLER DRIVER
> M: Emil Renner Berthing <kernel@xxxxxxxx>
This is now a conflict between the mmc tree and Linus' tree.
--
Cheers,
Stephen Rothwell
Attachment:
pgpRYhF0nLkpL.pgp
Description: OpenPGP digital signature
