Re: linux-next: build failure after merge of the crypto tree

From: Herbert Xu
Date: Tue Aug 13 2024 - 00:17:21 EST


On Mon, Aug 12, 2024 at 10:42:35AM +1000, Stephen Rothwell wrote:
>
> From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
> Date: Mon, 12 Aug 2024 10:36:30 +1000
> Subject: [PATCH] fixup for "crypto: spacc - Add SPAcc Skcipher support"
>
> interacting with commit
>
> 1a251f52cfdc ("minmax: make generic MIN() and MAX() macros available everywhere")
>
> from Linus' tree.
>
> Signed-off-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
> ---
> drivers/crypto/dwc-spacc/spacc_manager.c | 3 +--
> 1 file changed, 1 insertion(+), 2 deletions(-)

Thanks Stephen. I've applied your patch but I kept the macro but
added an ifndef MIN around it. This way it should work either with
or without Linus's patch.

Cheers,
--
Email: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt