Received-SPF: pass (google.com: domain of linux-crypto-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Date:   Tue, 23 May 2023 10:36:37 +1000
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Herbert Xu <herbert@gondor.apana.org.au>
Cc:     Linux Crypto List <linux-crypto@vger.kernel.org>,
        Huan Feng <huan.feng@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>
Subject: Re: linux-next: build failure after merge of the crypto tree
Message-ID: <20230523103637.20175fbc@canb.auug.org.au>
In-Reply-To: <ZGr6aB9uJVnyfJQ9@gondor.apana.org.au>
References: <20230522105257.562cb1ec@canb.auug.org.au>
        <ZGr6aB9uJVnyfJQ9@gondor.apana.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/8prTCi.GI047Yt2qEAvJrF.";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

--Sig_/8prTCi.GI047Yt2qEAvJrF.
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi Herbert,

On Mon, 22 May 2023 13:15:20 +0800 Herbert Xu <herbert@gondor.apana.org.au>=
 wrote:
>
> On Mon, May 22, 2023 at 10:52:57AM +1000, Stephen Rothwell wrote:
> >=20
> > After merging the crypto tree, today's linux-next build (x86_64
> > allmodconfig) failed like this: =20
>=20
> Sorry, a fix is pending and will be pushed out soon.

That did not fix it :-(

My fix up patch is now:

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 23 May 2023 10:31:28 +1000
Subject: [PATCH] fixup for "crypto: starfive - Add crypto engine support"

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 drivers/crypto/starfive/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/crypto/starfive/Kconfig b/drivers/crypto/starfive/Kcon=
fig
index 908c162ba79a..2a15d51534b9 100644
--- a/drivers/crypto/starfive/Kconfig
+++ b/drivers/crypto/starfive/Kconfig
@@ -4,7 +4,7 @@
=20
 config CRYPTO_DEV_JH7110
 	tristate "StarFive JH7110 cryptographic engine driver"
-	depends on (SOC_STARFIVE || COMPILE_TEST) && DMADEVICES
+	depends on SOC_STARFIVE && DMADEVICES
 	select CRYPTO_ENGINE
 	select CRYPTO_HMAC
 	select CRYPTO_SHA256
--=20
2.39.2

--=20
Cheers,
Stephen Rothwell

--Sig_/8prTCi.GI047Yt2qEAvJrF.
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmRsCpYACgkQAVBC80lX
0Gz0Swf/emvGMFeJkGQBY2CxLqqfdhXLSCqa8G3Kes33FT+wP+VuAHJpnh/04aBU
4rlAxMiJWAtIYG5QWz4VCanT/vIPj+ZvlNJJBq4+UiQf5r9lLeXHrARZIHEKs6ss
mdSkybWyLYnMFL1A70HFTQDbUFJ/gMFya6v0A7haVbe+UfsQCkUPxGvrmpFlrjXt
e9SRqYiLbxF/rY2wZbdBkVCLTtMYr9ZCsIoCZLSlBKHQL+mWC7cDmsUSID287y3G
PmQ9qATUKkQTnfSDCfA4Ko4CN/GnuaJRWuymoZKOXwzOOvhVG12jESELkvKyyNTk
H9ADh/enexrR9CCS/XgjF4g29sdYCg==
=KH/1
-----END PGP SIGNATURE-----

--Sig_/8prTCi.GI047Yt2qEAvJrF.--