From patchwork Tue Oct 27 13:45:06 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 312557 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=-9.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable 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 3D6BBC388F9 for ; Tue, 27 Oct 2020 15:43:43 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id E6DC52242B for ; Tue, 27 Oct 2020 15:43:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1603813423; bh=i0EIW0YgUxIOstdq/fu9DhJMZ/7qBkSR9SyVeIqPUnY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=jUEVZW1cAoDgY4LwYRwpqyHnODNcusMRrXmhnv8upEfUhEtkp9sXF1C/jY/RPyYnG QcWNVLawCS9hil+Ag4Weau2oXVuO7gcL35eu/PCmbxCEX2AXe8+Fk0W4F0X9IM25Yv IpxTGYs2m9uXS6YVuRkAexrIlDaYEjOyDGjPL+jk= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1798557AbgJ0P2w (ORCPT ); Tue, 27 Oct 2020 11:28:52 -0400 Received: from mail.kernel.org ([198.145.29.99]:60456 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1795931AbgJ0PTz (ORCPT ); Tue, 27 Oct 2020 11:19:55 -0400 Received: from localhost (83-86-74-64.cable.dynamic.v4.ziggo.nl [83.86.74.64]) (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 2FBD520728; Tue, 27 Oct 2020 15:19:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1603811994; bh=i0EIW0YgUxIOstdq/fu9DhJMZ/7qBkSR9SyVeIqPUnY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=sCYPt2nzzAdQ535UXcppueGqDXl8e5zG3pqDmH9wyqyjwo2wucGT5e1T1owo3XOv6 GwMnpDx+gvc48eZScoJiriXM/6BdjL7ie9sl3lITFs/ejrk1jm6prOGQDYYHCFQ9W0 iZhSFSNTfsmClI0dEvViQzOK0yMeTOB5UsN0KpUU= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Geert Uytterhoeven , Matthieu Baerts , Jakub Kicinski Subject: [PATCH 5.9 056/757] mptcp: MPTCP_KUNIT_TESTS should depend on MPTCP instead of selecting it Date: Tue, 27 Oct 2020 14:45:06 +0100 Message-Id: <20201027135453.178961495@linuxfoundation.org> X-Mailer: git-send-email 2.29.1 In-Reply-To: <20201027135450.497324313@linuxfoundation.org> References: <20201027135450.497324313@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Geert Uytterhoeven [ Upstream commit b142083b585c2c03af24cca4d274f797796a4064 ] MPTCP_KUNIT_TESTS selects MPTCP, thus enabling an optional feature the user may not want to enable. Fix this by making the test depend on MPTCP instead. Fixes: a00a582203dbc43e ("mptcp: move crypto test to KUNIT") Signed-off-by: Geert Uytterhoeven Reviewed-by: Matthieu Baerts Link: https://lore.kernel.org/r/20201019113240.11516-1-geert@linux-m68k.org Signed-off-by: Jakub Kicinski Signed-off-by: Greg Kroah-Hartman --- net/mptcp/Kconfig | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) --- a/net/mptcp/Kconfig +++ b/net/mptcp/Kconfig @@ -22,11 +22,8 @@ config MPTCP_IPV6 select IPV6 default y -endif - config MPTCP_KUNIT_TESTS tristate "This builds the MPTCP KUnit tests" if !KUNIT_ALL_TESTS - select MPTCP depends on KUNIT default KUNIT_ALL_TESTS help @@ -39,3 +36,4 @@ config MPTCP_KUNIT_TESTS If unsure, say N. +endif