From patchwork Tue Oct 27 13:53:50 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 307434 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=-12.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, 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 45794C83028 for ; Tue, 27 Oct 2020 15:56:44 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 09B12206B2 for ; Tue, 27 Oct 2020 15:56:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1603814204; bh=hh6NIyRlK4Wzwl+j76BIbzH/o10VR1Hj1qDhgVscnR4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=1aGARiV0SXitzG0Xwl0RgjX+w3YAjIiBRiutbxGHgzR31lD/3+SAfAuvTvDDo2ZHb SjXPa2SFTsbiCDKrvLFHJ6Zk1UjorFGus+MIv0CjfyQozk0mWCx/q0h9+BSWgcrWnH nmr0liHingRecTL11N3oHtsJN8rI9pKXtDN9PY8o= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1802740AbgJ0PvK (ORCPT ); Tue, 27 Oct 2020 11:51:10 -0400 Received: from mail.kernel.org ([198.145.29.99]:44158 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1802368AbgJ0Pq4 (ORCPT ); Tue, 27 Oct 2020 11:46:56 -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 1BBBA21D42; Tue, 27 Oct 2020 15:46:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1603813614; bh=hh6NIyRlK4Wzwl+j76BIbzH/o10VR1Hj1qDhgVscnR4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=gL2xjU/n/f2LAg6aeHLLUgZQC4/qqo0OFPrIEb3eilbbMAbTygEvj4Jwz/EBcTCpS ldo3Xba5NM2ObCijton3W3W4I3X04SeejYVtjFiRCDtdZlBKWoEbE9YgR1pK7fnVJr DVGeHtPNF5pOQ2JP0t/QhLTuiAhkQKbEArsP5bfw= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Matthieu Baerts , Mat Martineau , Jakub Kicinski , Sasha Levin Subject: [PATCH 5.9 580/757] selftests: mptcp: depends on built-in IPv6 Date: Tue, 27 Oct 2020 14:53:50 +0100 Message-Id: <20201027135517.727716271@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: Matthieu Baerts [ Upstream commit 287d35405989cfe0090e3059f7788dc531879a8d ] Recently, CONFIG_MPTCP_IPV6 no longer selects CONFIG_IPV6. As a consequence, if CONFIG_MPTCP_IPV6=y is added to the kconfig, it will no longer ensure CONFIG_IPV6=y. If it is not enabled, CONFIG_MPTCP_IPV6 will stay disabled and selftests will fail. We also need CONFIG_IPV6 to be built-in. For more details, please see commit 0ed37ac586c0 ("mptcp: depends on IPV6 but not as a module"). Note that 'make kselftest-merge' will take all 'config' files found in 'tools/testsing/selftests'. Because some of them already set CONFIG_IPV6=y, MPTCP selftests were still passing. But they will fail if MPTCP selftests are launched manually after having executed this command to prepare the kernel config: ./scripts/kconfig/merge_config.sh -m .config \ ./tools/testing/selftests/net/mptcp/config Fixes: 010b430d5df5 ("mptcp: MPTCP_IPV6 should depend on IPV6 instead of selecting it") Signed-off-by: Matthieu Baerts Reviewed-by: Mat Martineau Link: https://lore.kernel.org/r/20201021155549.933731-1-matthieu.baerts@tessares.net Signed-off-by: Jakub Kicinski Signed-off-by: Sasha Levin --- tools/testing/selftests/net/mptcp/config | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/testing/selftests/net/mptcp/config b/tools/testing/selftests/net/mptcp/config index 8df5cb8f71ff9..741a1c4f4ae8f 100644 --- a/tools/testing/selftests/net/mptcp/config +++ b/tools/testing/selftests/net/mptcp/config @@ -1,4 +1,5 @@ CONFIG_MPTCP=y +CONFIG_IPV6=y CONFIG_MPTCP_IPV6=y CONFIG_INET_DIAG=m CONFIG_INET_MPTCP_DIAG=m