Hi Herbert,
Today's linux-next merge of the crypto tree got a conflict in
drivers/char/hw_random/Kconfig between commit 2257ffbca73c ("hwrng: msm:
switch Kconfig to ARCH_QCOM depends") from the arm-soc tree and commit
f9bee046c915 ("hwrng: msm: switch Kconfig to ARCH_QCOM depends") from the
crypto tree.
Two version of the same patch ... I just kept the arm-soc version.
--
Cheers,
Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Attachment:
pgpROaCaAAZF5.pgp
Description: PGP signature
