From patchwork Wed Nov 25 08:25:16 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khalid Elmously X-Patchwork-Id: 1405951 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=canonical.com Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4Cgv972y7pz9sVY; Wed, 25 Nov 2020 19:25:47 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1khq7S-0005OV-VL; Wed, 25 Nov 2020 08:25:42 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1khq7P-0005Ll-K9 for kernel-team@lists.ubuntu.com; Wed, 25 Nov 2020 08:25:39 +0000 Received: from mail-il1-f197.google.com ([209.85.166.197]) by youngberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1khq7P-0006lK-AM for kernel-team@lists.ubuntu.com; Wed, 25 Nov 2020 08:25:39 +0000 Received: by mail-il1-f197.google.com with SMTP id l8so1146880ilf.10 for ; Wed, 25 Nov 2020 00:25:39 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=WtbfJaXFgE7Bl6SduNp2+H95/XCOv2x78LyW3Wvp2HA=; b=jL/jcN9H+o2hZ5fpeq1ePhNPbY310WPPH3gLwbyYGaMX8mEwcDzRAAfH9yf4MWq1LJ bbAPDpQ9oByhi8A1JGGwae29RX7qfF5GRH/io7LxquhvzVYBUyP7WjUEvJ2e8WNKUH1n WGtFOblS/qWAYDvb64uVype8bIvM9Je7ALoc5p/AQTQAYFvD7bRAExqS1qkDdFZcD8pM QQspBZ0RrknWCbKb+kAnBAPOzO25udMsJtnEXR1O0g2sOKOF325RcT1yX8l5+/RxZrMq gBtlrzvl1Afdm6tYfanieS7OeGeYBBmM6akZI1s89OqIzPdf/u7k37Ld9ptGt30gWKub 0xvA== X-Gm-Message-State: AOAM530QrqpzbGypOv/2Nqrk7DOjkkxJ2j1qlOKj+Mdn/fBHUgCY3Z90 B/wZYi9O5FUZ/Ll+PvP4fTHAmrz9mRHs56ZlFC8aIVtYCvY/u9DJRpgxZctxr5XEiSW/mmkVZdx Wc0KvMGnj9x5F1K8NWiDh8X0Oyzl95SIS+0sevUeIgQ== X-Received: by 2002:a92:9904:: with SMTP id p4mr2056747ili.145.1606292738029; Wed, 25 Nov 2020 00:25:38 -0800 (PST) X-Google-Smtp-Source: ABdhPJySp3fgddbWclDV6YQwXrvjGXHhNzceOI1N8ds5Zcunjt3A2qcxUbhENS5qjODPDmNZQvOk0w== X-Received: by 2002:a92:9904:: with SMTP id p4mr2056738ili.145.1606292737799; Wed, 25 Nov 2020 00:25:37 -0800 (PST) Received: from kbuntu2.fuzzbuzz.org (dhcp-24-53-242-104.cable.user.start.ca. [24.53.242.104]) by smtp.gmail.com with ESMTPSA id u12sm855082ilg.10.2020.11.25.00.25.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 25 Nov 2020 00:25:37 -0800 (PST) From: Khalid Elmously To: kernel-team@lists.ubuntu.com Subject: [SRU][G/kvm][PATCH 1/1] Set CONFIG_NET_IPIP and CONIG_IPV6_SIT =m Date: Wed, 25 Nov 2020 03:25:16 -0500 Message-Id: <20201125082517.20148-4-khalid.elmously@canonical.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20201125082517.20148-1-khalid.elmously@canonical.com> References: <20201125082517.20148-1-khalid.elmously@canonical.com> X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" BugLink: https://bugs.launchpad.net/bugs/1899832 There's no good reason for these modules to be statically built-in, and they are causing test validation problems on some clouds. Signed-off-by: Khalid Elmously --- debian.kvm/config/config.common.ubuntu | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/debian.kvm/config/config.common.ubuntu b/debian.kvm/config/config.common.ubuntu index 0be8b034f223..d80a96a122cb 100644 --- a/debian.kvm/config/config.common.ubuntu +++ b/debian.kvm/config/config.common.ubuntu @@ -1217,7 +1217,7 @@ CONFIG_INET_ESP_OFFLOAD=m CONFIG_INET_IPCOMP=m # CONFIG_INET_RAW_DIAG is not set CONFIG_INET_TCP_DIAG=y -CONFIG_INET_TUNNEL=y +CONFIG_INET_TUNNEL=m # CONFIG_INET_UDP_DIAG is not set CONFIG_INET_XFRM_TUNNEL=m # CONFIG_INFINIBAND is not set @@ -1311,7 +1311,7 @@ CONFIG_IPV6_NDISC_NODETYPE=y # CONFIG_IPV6_RPL_LWTUNNEL is not set # CONFIG_IPV6_SEG6_HMAC is not set # CONFIG_IPV6_SEG6_LWTUNNEL is not set -CONFIG_IPV6_SIT=y +CONFIG_IPV6_SIT=m # CONFIG_IPV6_SIT_6RD is not set CONFIG_IPV6_SUBTREES=y # CONFIG_IPV6_TUNNEL is not set @@ -1752,9 +1752,9 @@ CONFIG_NET_FLOW_LIMIT=y # CONFIG_NET_IFE is not set CONFIG_NET_INGRESS=y # CONFIG_NET_IPGRE_DEMUX is not set -CONFIG_NET_IPIP=y +CONFIG_NET_IPIP=m # CONFIG_NET_IPVTI is not set -CONFIG_NET_IP_TUNNEL=y +CONFIG_NET_IP_TUNNEL=m CONFIG_NET_KEY=m # CONFIG_NET_KEY_MIGRATE is not set CONFIG_NET_L3_MASTER_DEV=y