Date:   Thu, 23 Feb 2023 11:13:42 +1100
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Ulf Hansson <ulf.hansson@linaro.org>
Cc:     Linus Walleij <linus.walleij@linaro.org>,
        Emil Renner Berthing <kernel@esmil.dk>,
        Hal Feng <hal.feng@starfivetech.com>,
        Jianlong Huang <jianlong.huang@starfivetech.com>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>,
        William Qiu <william.qiu@starfivetech.com>
Subject: Re: linux-next: manual merge of the pinctrl tree with the mmc tree
Message-ID: <20230223111342.7177513b@canb.auug.org.au>
In-Reply-To: <20230216124004.2be84a01@canb.auug.org.au>
References: <20230216124004.2be84a01@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/_9=sdbnY1po0KZ9=MCz8NlM";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

--Sig_/_9=sdbnY1po0KZ9=MCz8NlM
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

On Thu, 16 Feb 2023 12:40:04 +1100 Stephen Rothwell <sfr@canb.auug.org.au> =
wrote:
>=20
> Today's linux-next merge of the pinctrl tree got a conflict in:
>=20
>   MAINTAINERS
>=20
> between commit:
>=20
>   9e622229bbf4 ("mmc: starfive: Add sdio/emmc driver support")
>=20
> from the mmc tree and commit:
>=20
>   d6e0a660097d ("dt-bindings: pinctrl: Add StarFive JH7110 sys pinctrl")
>=20
> from the pinctrl tree.
>=20
> 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.
>=20
> --=20
> Cheers,
> Stephen Rothwell
>=20
> diff --cc MAINTAINERS
> index 1208b0380fa5,8a851eb053ca..000000000000
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@@ -19914,19 -19890,15 +19914,21 @@@ F:	Documentation/devicetree/binding=
s/cl
>   F:	drivers/clk/starfive/clk-starfive-jh7100*
>   F:	include/dt-bindings/clock/starfive-jh7100*.h
>  =20
>  +STARFIVE JH7110 MMC/SD/SDIO DRIVER
>  +M:	William Qiu <william.qiu@starfivetech.com>
>  +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@esmil.dk>
> + M:	Jianlong Huang <jianlong.huang@starfivetech.com>
>   L:	linux-gpio@vger.kernel.org
>   S:	Maintained
> - F:	Documentation/devicetree/bindings/pinctrl/starfive,jh7100-pinctrl.ya=
ml
> - 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
>  =20
>   STARFIVE JH7100 RESET CONTROLLER DRIVER
>   M:	Emil Renner Berthing <kernel@esmil.dk>

This is now a conflict between the mmc tree and Linus' tree.

--=20
Cheers,
Stephen Rothwell

--Sig_/_9=sdbnY1po0KZ9=MCz8NlM
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

-----BEGIN PGP SIGNATURE-----

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmP2r7YACgkQAVBC80lX
0Gw58Qf/aL6sDMlZhTKxlEKQfAFa7xFCJJ3ol8+Ax+U31sRQ5GIMjgS5MHmyhwK3
0ElS1IewbjdtXInsg1g+JfMKEHb33qjsY+WTrtp5CXgaXWmGCfuBG2UTaHJqxkVc
QJ/dupzye+qqeauNnorPi1qdKn6EajhKSC/Mfspo2gbNYxT/Huy94Wi1BHCMOV2I
Caznw7EY9nztB40JHIsM+iKDsLZHCOH0dAEP79OL1dRblWnmXoSklafTJrYg8kbX
ih7uBKBskwGYLk/RmETrFhJW+OCVa9RMUMEcWTXZb4vQgL1sj3J1uWFYnKRqUCaR
fNa+wDKf8F40zKHlATVOlm++yXB8sg==
=QN80
-----END PGP SIGNATURE-----

--Sig_/_9=sdbnY1po0KZ9=MCz8NlM--