From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 404AAC352A3 for ; Mon, 10 Feb 2020 12:44:42 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 1A0302051A for ; Mon, 10 Feb 2020 12:44:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1581338682; bh=8Sa8/RzdvR/yozr7Cazg+eUBPoVAQJx9MjoIwYNUYmk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=gjq7ftK+85K0M2NN+PBHPQ2SmC9cA4Nl/zxHdqufCU9AQCKicp5Qrmo9x9kb/Wycg Uj8suyX6WsEEOPsQz6gxJHyPS+4RXvKijWo+io9ZmKhDqVj7jTQw1rPPkKnXjN0yY6 W0t9134/m7aKq7KFYqYVDfNzQUtN9AwCQobZp8jg= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728657AbgBJMol (ORCPT ); Mon, 10 Feb 2020 07:44:41 -0500 Received: from mail.kernel.org ([198.145.29.99]:41428 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728568AbgBJMko (ORCPT ); Mon, 10 Feb 2020 07:40:44 -0500 Received: from localhost (unknown [209.37.97.194]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 8D90F2173E; Mon, 10 Feb 2020 12:40:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1581338443; bh=8Sa8/RzdvR/yozr7Cazg+eUBPoVAQJx9MjoIwYNUYmk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=KEVpWpBadw8/ajbbjc8oDjRq2YkoGtkBym9V5SSmOtQYXHF19FJ0yho+HL/avmixo qz5MN4IHTJYtRMkkaO39/bO2FvmlkdVGT+kYSlOKAQwr6PQSUPYAVD0qy3a2DxsWLa 4thvpUK8wcjdcQGNa1L3rfAMC6Uw6nlgIAdi/Bgs= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Eric Biggers , Herbert Xu Subject: [PATCH 5.5 183/367] crypto: hisilicon - select CRYPTO_SKCIPHER, not CRYPTO_BLKCIPHER Date: Mon, 10 Feb 2020 04:31:36 -0800 Message-Id: <20200210122441.612820339@linuxfoundation.org> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200210122423.695146547@linuxfoundation.org> References: <20200210122423.695146547@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Eric Biggers commit 8e8c778d9ed4fdc5a9af108c7023bfb640a673f2 upstream. Another instance of CRYPTO_BLKCIPHER made it in just after it was renamed to CRYPTO_SKCIPHER. Fix it. Fixes: 416d82204df4 ("crypto: hisilicon - add HiSilicon SEC V2 driver") Signed-off-by: Eric Biggers Signed-off-by: Herbert Xu Signed-off-by: Greg Kroah-Hartman --- drivers/crypto/hisilicon/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/drivers/crypto/hisilicon/Kconfig +++ b/drivers/crypto/hisilicon/Kconfig @@ -16,7 +16,7 @@ config CRYPTO_DEV_HISI_SEC config CRYPTO_DEV_HISI_SEC2 tristate "Support for HiSilicon SEC2 crypto block cipher accelerator" - select CRYPTO_BLKCIPHER + select CRYPTO_SKCIPHER select CRYPTO_ALGAPI select CRYPTO_LIB_DES select CRYPTO_DEV_HISI_QM