Date:   Mon, 30 Jan 2023 11:41:28 +1100
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Herbert Xu <herbert@gondor.apana.org.au>,
        Linux Crypto List <linux-crypto@vger.kernel.org>,
        Conor Dooley <Conor.Dooley@microchip.com>
Cc:     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: linux-next: manual merge of the crypto tree with the riscv-soc tree
Message-ID: <20230130114128.692c7961@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/KH5DK6QNIZ/KCUvB7fAl+/w";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

--Sig_/KH5DK6QNIZ/KCUvB7fAl+/w
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

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.

--=20
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
 =20
 +STARFIVE SOC DRIVERS
 +M:	Conor Dooley <conor@kernel.org>
 +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 <walker.chen@starfivetech.com>
 +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 <jiajie.ho@starfivetech.com>
+ S:	Supported
+ F:	Documentation/devicetree/bindings/rng/starfive*
+ F:	drivers/char/hw_random/starfive-trng.c
+=20
  STATIC BRANCH/CALL
  M:	Peter Zijlstra <peterz@infradead.org>
  M:	Josh Poimboeuf <jpoimboe@kernel.org>

--Sig_/KH5DK6QNIZ/KCUvB7fAl+/w
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmPXEjgACgkQAVBC80lX
0Gwr9Qf7Bcprcfh4uYoEF82I1tYi5zMBZGMCxWP8+1FHwAAdcR0j1BkCg5RMhaOS
b5fycuDjxwsrhNPHu8Ry8/y5nfN/XIZywrSv+Xh8aIBKsN4/lSd3sg77wNMcFAdJ
4PS9zJiciOGRpTtsmqQzkodIhvWIaeVm26JCOshOMjU0dqfDlDRJk4MQP2rQ6OQA
QVjkFhNWwfCCLRuEsHEML3IdDgOydWDqbk27xcqPSPmk/hbtP9z0chKIIb4d79fc
GQW/bqVeEH7DD5QLeFHsy2aUmIXZ4DGnBRcb07+ZKflCSFBVgYLVwbZptJoiiLv4
a6njJZc0Bumb/nIaHC/qX4Oiu16g6A==
=aa7N
-----END PGP SIGNATURE-----

--Sig_/KH5DK6QNIZ/KCUvB7fAl+/w--