From patchwork Wed Oct 10 13:41:33 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Seth Forshee X-Patchwork-Id: 981879 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) 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 42VZyP4G1Zz9sDJ; Thu, 11 Oct 2018 00:41:49 +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 1gAEkB-0000GD-RQ; Wed, 10 Oct 2018 13:41:43 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by huckleberry.canonical.com with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:128) (Exim 4.86_2) (envelope-from ) id 1gAEk9-0000FO-Jr for kernel-team@lists.ubuntu.com; Wed, 10 Oct 2018 13:41:41 +0000 Received: from mail-yw1-f71.google.com ([209.85.161.71]) by youngberry.canonical.com with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.76) (envelope-from ) id 1gAEk9-0005S6-A3 for kernel-team@lists.ubuntu.com; Wed, 10 Oct 2018 13:41:41 +0000 Received: by mail-yw1-f71.google.com with SMTP id x5-v6so2843984ywd.19 for ; Wed, 10 Oct 2018 06:41:41 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=U8iC6xkdHN6mQraZf0mY4DHRc6usMrCkti9zourNes4=; b=dit6RLHilqnVU08z4fomLoF/fcU1tH2GIFNn1DaROlR9cIB21rt2iNFyIs2LkGi3E5 l/1XTOL2Mfxt18BI3OmphZ8LykN4DOXArQ7j2o/0iTH6ccA+M7MEotVlHKAy1Zi3xVaY Z3zQHh/duBCKGsdu3VG6kPb49wYK/ceqx2BzlklTa4rNH2ijSDrtALV0pa1ygotZMMz3 J0Gm/kbAEuyp8LUb9P7Vhu98xobwP3yNbJxxrDnkJFuZuvPpovid0Zl0dL8ZB9xgDcCH uCkJiSKx0P5dI0K3bGeaTWLdpGjxIQ8hvH0xZ1GD4KbzTxSL50/kv2EW1T/sryrYU/7z mg8Q== X-Gm-Message-State: ABuFfoiE0dIMwSai8H6nArqU+SkpQ5IV7CYOTIjyTPP4uXK+2zxxhcnu i1BtQoQLbYMaHw9p3QIGKhH3NzukXVTYTQNTGbfu7IwA6clpevHBJPia4sCNF2cUTQrStTZx+Os PUshEdkzc1Yx89YxFhgUMtUpS7Y4JeTxDzB7+oorWCA== X-Received: by 2002:a0d:ea03:: with SMTP id t3-v6mr19074831ywe.496.1539178899953; Wed, 10 Oct 2018 06:41:39 -0700 (PDT) X-Google-Smtp-Source: ACcGV62oUeD26hWb5Lz5VW1+E7LWqo/NOwJHU2+kvK71PdPFYiEyp1PIc/GZKFVgi96POo89bmb01w== X-Received: by 2002:a0d:ea03:: with SMTP id t3-v6mr19074811ywe.496.1539178899538; Wed, 10 Oct 2018 06:41:39 -0700 (PDT) Received: from localhost ([2605:a601:ac7:2a20:1c05:70d2:7634:47a6]) by smtp.gmail.com with ESMTPSA id y198-v6sm11531849ywy.64.2018.10.10.06.41.38 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 10 Oct 2018 06:41:38 -0700 (PDT) From: Seth Forshee To: kernel-team@lists.ubuntu.com Subject: [PATCH 1/3][C/Unstable] UBUNTU: [Config] CONFIG_VBOXGUEST=n Date: Wed, 10 Oct 2018 08:41:33 -0500 Message-Id: <20181010134135.10555-2-seth.forshee@canonical.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181010134135.10555-1-seth.forshee@canonical.com> References: <20181010134135.10555-1-seth.forshee@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" https://bugs.launchpad.net/bugs/1796647 This conflicts with the module of the same name which we import from the dkms package. The one from the dkms package is needed for exports consumed by the other imported modules, so disable the in-tree vboxguest module. Signed-off-by: Seth Forshee --- debian.master/abi/4.18.0-9.10/amd64/generic.modules | 1 - debian.master/abi/4.18.0-9.10/amd64/lowlatency.modules | 1 - debian.master/abi/4.18.0-9.10/i386/generic.modules | 1 - debian.master/abi/4.18.0-9.10/i386/lowlatency.modules | 1 - debian.master/config/annotations | 5 ++++- debian.master/config/config.common.ubuntu | 2 +- 6 files changed, 5 insertions(+), 6 deletions(-) diff --git a/debian.master/abi/4.18.0-9.10/amd64/generic.modules b/debian.master/abi/4.18.0-9.10/amd64/generic.modules index 3ecfad846ed1..4891a4bd6c14 100644 --- a/debian.master/abi/4.18.0-9.10/amd64/generic.modules +++ b/debian.master/abi/4.18.0-9.10/amd64/generic.modules @@ -4841,7 +4841,6 @@ v4l2-flash-led-class v4l2-fwnode v4l2-mem2mem v4l2-tpg -vboxguest vboxvideo vcan vcnl4000 diff --git a/debian.master/abi/4.18.0-9.10/amd64/lowlatency.modules b/debian.master/abi/4.18.0-9.10/amd64/lowlatency.modules index 28a50c10c162..4037310bc0a0 100644 --- a/debian.master/abi/4.18.0-9.10/amd64/lowlatency.modules +++ b/debian.master/abi/4.18.0-9.10/amd64/lowlatency.modules @@ -4842,7 +4842,6 @@ v4l2-flash-led-class v4l2-fwnode v4l2-mem2mem v4l2-tpg -vboxguest vboxvideo vcan vcnl4000 diff --git a/debian.master/abi/4.18.0-9.10/i386/generic.modules b/debian.master/abi/4.18.0-9.10/i386/generic.modules index 6ffaed2b7f5e..4911085c0d7b 100644 --- a/debian.master/abi/4.18.0-9.10/i386/generic.modules +++ b/debian.master/abi/4.18.0-9.10/i386/generic.modules @@ -4944,7 +4944,6 @@ v4l2-flash-led-class v4l2-fwnode v4l2-mem2mem v4l2-tpg -vboxguest vboxvideo vcan vcnl4000 diff --git a/debian.master/abi/4.18.0-9.10/i386/lowlatency.modules b/debian.master/abi/4.18.0-9.10/i386/lowlatency.modules index b40e004a9080..604b39a89a91 100644 --- a/debian.master/abi/4.18.0-9.10/i386/lowlatency.modules +++ b/debian.master/abi/4.18.0-9.10/i386/lowlatency.modules @@ -4945,7 +4945,6 @@ v4l2-flash-led-class v4l2-fwnode v4l2-mem2mem v4l2-tpg -vboxguest vboxvideo vcan vcnl4000 diff --git a/debian.master/config/annotations b/debian.master/config/annotations index 93813c874627..452706670b51 100644 --- a/debian.master/config/annotations +++ b/debian.master/config/annotations @@ -8510,7 +8510,10 @@ CONFIG_VIRTIO_MMIO note # Menu: Device Drivers >> Virtualization drivers CONFIG_VIRT_DRIVERS policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'ppc64el': 'y', 's390x': 'y'}> -CONFIG_VBOXGUEST policy<{'amd64': 'm', 'i386': 'm'}> +CONFIG_VBOXGUEST policy<{'amd64': 'n', 'i386': 'n'}> +# +CONFIG_VBOXGUEST note + # Menu: Device Drivers >> Voltage and Current Regulator Support CONFIG_REGULATOR policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'ppc64el': 'y', 's390x': 'n'}> diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu index e2ae8922b310..dfe44babcb45 100644 --- a/debian.master/config/config.common.ubuntu +++ b/debian.master/config/config.common.ubuntu @@ -10088,7 +10088,7 @@ CONFIG_V4L_MEM2MEM_DRIVERS=y CONFIG_V4L_PLATFORM_DRIVERS=y CONFIG_V4L_RADIO_ISA_DRIVERS=y CONFIG_V4L_TEST_DRIVERS=y -CONFIG_VBOXGUEST=m +# CONFIG_VBOXGUEST is not set CONFIG_VCNL4000=m CONFIG_VDSO=y CONFIG_VEML6070=m