Received: by 2002:a05:6a10:1a4d:0:0:0:0 with SMTP id nk13csp2166322pxb; Wed, 9 Feb 2022 12:17:20 -0800 (PST) X-Google-Smtp-Source: ABdhPJy5SSsd9VO7xiomTQPSVgofYPeUj72KobRpjdFEYhEDEbVWJY3WA1xIVsUITOc+bKy9zkxT X-Received: by 2002:a17:902:b487:: with SMTP id y7mr3842406plr.81.1644437839962; Wed, 09 Feb 2022 12:17:19 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1644437839; cv=none; d=google.com; s=arc-20160816; b=IkvZejezEi83jbXXQ7beLWBJOt6L4/FCnm7Z5OlO3PIKU5BtQWt0o3/k9UrIE5byFp yisbPMsoZCPl2O/7lgyq/enB/If+5DQhQx8e3kue6Hau/iYMD17XaPVE5dSZliG5e8Sn LTJNRcm3pyRZKuFP4nszEu6S8aFD45RokWgZ5kTB98hEMLbCPNO1p4efybGH/T3jIxm7 e9f54qSPVqOWwFIHliV8qwaRj5DKC771wkrlympMnqd/zzKuxyQb9gguT96f5Jl5bsBX phiylCEjI2MKlhSsAuLxMy7Cbk34EDMbl8/L1GBHEmg+DYAPVhZZjGjmtxWV7un6M0GZ /8wg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=ZoTXPYGKcKDfuKr0DJEArSsq4ovpBNszm2wSSVBG/5w=; b=FwUfsMJe5ksDsltAdKPzsuS3LhIBnbmC00lX25XFIP8yFFQuTcBSs8wOJXaFqcSDA0 e0bnmlODvQaPxdE+2oj0NZlXx/tIWHY+gUQmd41F9cTWnisd4Ti3arSkiwUx/p/pLzlu VJykwlQEHApKhCsLz9so8S40o/tQ1PViGYN5bDX2HAtOmnSGOK1GeAgkm5a9MMRqcCKx 4Usb6MgPGv2vZPpgo2hFl1XYuA3LZaqUNfUY9gqSCfYMK+GorzO5W1rKtvQ77p88PI/p 9BUNz7ycbc+cRuMOCK3NsGW1wxGBwi6YXa6uMIk3p7aNgIihKZqEdEvkLqHPQfJ7cu+2 dDbQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=AO93oF5Z; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from lindbergh.monkeyblade.net (lindbergh.monkeyblade.net. [2620:137:e000::1:18]) by mx.google.com with ESMTPS id w9si4592250pga.603.2022.02.09.12.17.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 09 Feb 2022 12:17:19 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) client-ip=2620:137:e000::1:18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=AO93oF5Z; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 321BFE0481FA; Wed, 9 Feb 2022 11:56:46 -0800 (PST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231846AbiBITQ4 (ORCPT + 99 others); Wed, 9 Feb 2022 14:16:56 -0500 Received: from gmail-smtp-in.l.google.com ([23.128.96.19]:47788 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229470AbiBITQx (ORCPT ); Wed, 9 Feb 2022 14:16:53 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4D9FCC1DF839; Wed, 9 Feb 2022 11:16:49 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 754F661968; Wed, 9 Feb 2022 19:15:30 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5AA07C340E7; Wed, 9 Feb 2022 19:15:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1644434129; bh=cxAjMI/wZemz9Un7wPgNEpqPz41777mFB2zheqRyAKg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=AO93oF5ZK2rhqaFJJwmNwXSq6YAzQdTPQczdtEk6SkaGhbBdQhGl8xVEhrPHfNW3k UNvZ2M1S2QWzgA5CFMGb5TnhDo9Im4LVdQzVdaZC3+S+dBHaqhTm4ykbQszS5iKNIB fJQCh4QEHRy9b65EHuWag8Bv8+214REmpNCaN4To= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Jan Beulich , Herbert Xu Subject: [PATCH 5.10 3/3] crypto: api - Move cryptomgr soft dependency into algapi Date: Wed, 9 Feb 2022 20:14:21 +0100 Message-Id: <20220209191249.005811880@linuxfoundation.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220209191248.892853405@linuxfoundation.org> References: <20220209191248.892853405@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RDNS_NONE,SPF_HELO_NONE,T_SCC_BODY_TEXT_LINE autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Herbert Xu commit c6ce9c5831cae515d375a01b97ae1778689acf19 upstream. The soft dependency on cryptomgr is only needed in algapi because if algapi isn't present then no algorithms can be loaded. This also fixes the case where api is built-in but algapi is built as a module as the soft dependency would otherwise get lost. Fixes: 8ab23d547f65 ("crypto: api - Add softdep on cryptomgr") Reported-by: Jan Beulich Signed-off-by: Herbert Xu Tested-by: Jan Beulich Signed-off-by: Herbert Xu Signed-off-by: Greg Kroah-Hartman --- crypto/algapi.c | 1 + crypto/api.c | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) --- a/crypto/algapi.c +++ b/crypto/algapi.c @@ -1295,3 +1295,4 @@ module_exit(crypto_algapi_exit); MODULE_LICENSE("GPL"); MODULE_DESCRIPTION("Cryptographic algorithms API"); +MODULE_SOFTDEP("pre: cryptomgr"); --- a/crypto/api.c +++ b/crypto/api.c @@ -603,4 +603,3 @@ EXPORT_SYMBOL_GPL(crypto_req_done); MODULE_DESCRIPTION("Cryptographic core API"); MODULE_LICENSE("GPL"); -MODULE_SOFTDEP("pre: cryptomgr");