This is a note to let you know that I've just added the patch titled selftests/tls: Fix tls selftests dependency to correct algorithm to the 6.0-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: selftests-tls-fix-tls-selftests-dependency-to-correct-algorithm.patch and it can be found in the queue-6.0 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let <stable@xxxxxxxxxxxxxxx> know about it. >From 6648eadba8d6b37c8e6cb1b906f68509b3b39385 Mon Sep 17 00:00:00 2001 From: Tianjia Zhang <tianjia.zhang@xxxxxxxxxxxxxxxxx> Date: Thu, 1 Dec 2022 21:18:52 +0800 Subject: selftests/tls: Fix tls selftests dependency to correct algorithm From: Tianjia Zhang <tianjia.zhang@xxxxxxxxxxxxxxxxx> commit 6648eadba8d6b37c8e6cb1b906f68509b3b39385 upstream. Commit d2825fa9365d ("crypto: sm3,sm4 - move into crypto directory") moves SM3 and SM4 algorithm implementations from stand-alone library to crypto API. The corresponding configuration options for the API version (generic) are CONFIG_CRYPTO_SM3_GENERIC and CONFIG_CRYPTO_SM4_GENERIC, respectively. Replace option selected in selftests configuration from the library version to the API version. Fixes: d2825fa9365d ("crypto: sm3,sm4 - move into crypto directory") Reported-by: Hangbin Liu <liuhangbin@xxxxxxxxx> Cc: Jason A. Donenfeld <Jason@xxxxxxxxx> Cc: stable@xxxxxxxxxxxxxxx # v5.19+ Signed-off-by: Tianjia Zhang <tianjia.zhang@xxxxxxxxxxxxxxxxx> Link: https://lore.kernel.org/r/20221201131852.38501-1-tianjia.zhang@xxxxxxxxxxxxxxxxx Signed-off-by: Jakub Kicinski <kuba@xxxxxxxxxx> Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> --- tools/testing/selftests/net/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/testing/selftests/net/config b/tools/testing/selftests/net/config index ead7963b9bf0..bd89198cd817 100644 --- a/tools/testing/selftests/net/config +++ b/tools/testing/selftests/net/config @@ -43,5 +43,5 @@ CONFIG_NET_ACT_TUNNEL_KEY=m CONFIG_NET_ACT_MIRRED=m CONFIG_BAREUDP=m CONFIG_IPV6_IOAM6_LWTUNNEL=y -CONFIG_CRYPTO_SM4=y +CONFIG_CRYPTO_SM4_GENERIC=y CONFIG_AMT=m -- 2.38.1 Patches currently in stable-queue which might be from tianjia.zhang@xxxxxxxxxxxxxxxxx are queue-6.0/selftests-tls-fix-tls-selftests-dependency-to-correct-algorithm.patch