Date:   Mon, 30 Jan 2023 07:54:17 +0000
From:   Conor Dooley <conor.dooley@microchip.com>
To:     Stephen Rothwell <sfr@canb.auug.org.au>
CC:     Herbert Xu <herbert@gondor.apana.org.au>,
        Linux Crypto List <linux-crypto@vger.kernel.org>,
        Jenny Zhang <jenny.zhang@starfivetech.com>,
        Jia Jie Ho <jiajie.ho@starfivetech.com>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>,
        Walker Chen <walker.chen@starfivetech.com>
Subject: Re: linux-next: manual merge of the crypto tree with the riscv-soc
 tree
Message-ID: <Y9d3qWZYlULl8Vxq@wendy>
References: <20230130114128.692c7961@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha256;
        protocol="application/pgp-signature"; boundary="NvR2dxayvgF+UicQ"
Content-Disposition: inline
In-Reply-To: <20230130114128.692c7961@canb.auug.org.au>
Precedence: bulk

--NvR2dxayvgF+UicQ
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

On Mon, Jan 30, 2023 at 11:41:28AM +1100, Stephen Rothwell wrote:
> Hi all,
>=20
> Today's linux-next merge of the crypto tree got a conflict in:
>=20
>   MAINTAINERS
>=20
> between commit:
>=20
>   08b9a94e8654 ("soc: starfive: Add StarFive JH71XX pmu driver")
>=20
> from the riscv-soc tree and commit:
>=20
>   c388f458bc34 ("hwrng: starfive - Add TRNG driver for StarFive SoC")
>=20
> 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

--NvR2dxayvgF+UicQ
Content-Type: application/pgp-signature; name="signature.asc"

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

iHUEABYIAB0WIQRh246EGq/8RLhDjO14tDGHoIJi0gUCY9d3iwAKCRB4tDGHoIJi
0rKXAP9XsN9TwPiTn6NtRxbzzgXVP4IccdRaJxPHAriEpcyAFgEAvZf4E5L5iVRz
wltg1n/FIKDvPFgrEmDggSNxtuaCug8=
=J/5E
-----END PGP SIGNATURE-----

--NvR2dxayvgF+UicQ--