From patchwork Mon Sep 2 13:24:16 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Pisati X-Patchwork-Id: 1156633 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 46MW5T5sWvz9sN1; Mon, 2 Sep 2019 23:24:29 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1i4mJf-0002Pp-9F; Mon, 02 Sep 2019 13:24:19 +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 1i4mJe-0002PW-2z for kernel-team@lists.ubuntu.com; Mon, 02 Sep 2019 13:24:18 +0000 Received: from 1.general.ppisati.uk.vpn ([10.172.193.134] helo=canonical.com) by youngberry.canonical.com with esmtpsa (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.76) (envelope-from ) id 1i4mJd-0001Bx-Ob for kernel-team@lists.ubuntu.com; Mon, 02 Sep 2019 13:24:17 +0000 From: Paolo Pisati To: kernel-team@lists.ubuntu.com Subject: [PATCH 1/1] UBUNTU: [Config] disable NVME Date: Mon, 2 Sep 2019 15:24:16 +0200 Message-Id: <20190902132416.8460-2-paolo.pisati@canonical.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190902132416.8460-1-paolo.pisati@canonical.com> References: <20190902132416.8460-1-paolo.pisati@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/1838619 Signed-off-by: Paolo Pisati Acked-by: Kleber Sacilotto de Souza Acked-by: Colin Ian King --- .../abi/4.15.0-1043.46/arm64/raspi2.modules | 8 -------- .../abi/4.15.0-1043.46/armhf/raspi2.modules | 8 -------- debian.raspi2/config/config.common.ubuntu | 15 +++------------ 3 files changed, 3 insertions(+), 28 deletions(-) diff --git a/debian.raspi2/abi/4.15.0-1043.46/arm64/raspi2.modules b/debian.raspi2/abi/4.15.0-1043.46/arm64/raspi2.modules index c65f3527562b..ac8f3b5afbcc 100644 --- a/debian.raspi2/abi/4.15.0-1043.46/arm64/raspi2.modules +++ b/debian.raspi2/abi/4.15.0-1043.46/arm64/raspi2.modules @@ -2271,12 +2271,6 @@ nsh ntc_thermistor ntfs null_blk -nvme-core -nvme-fabrics -nvme-fc -nvme-loop -nvmet -nvmet-fc nxp-nci nxp-nci_i2c nxp-ptn3460 @@ -2350,7 +2344,6 @@ parport parport_ax88796 pata_of_platform pata_platform -pblk pc87360 pc87427 pcap-regulator @@ -2699,7 +2692,6 @@ rpisense-fb rpisense-js rpmsg_core rpr0521 -rrpc rsi_91x rsi_sdio rsi_usb diff --git a/debian.raspi2/abi/4.15.0-1043.46/armhf/raspi2.modules b/debian.raspi2/abi/4.15.0-1043.46/armhf/raspi2.modules index b89999d2480e..ad6c834090ed 100644 --- a/debian.raspi2/abi/4.15.0-1043.46/armhf/raspi2.modules +++ b/debian.raspi2/abi/4.15.0-1043.46/armhf/raspi2.modules @@ -2290,12 +2290,6 @@ nsh ntc_thermistor ntfs null_blk -nvme-core -nvme-fabrics -nvme-fc -nvme-loop -nvmet -nvmet-fc nvram nxp-nci nxp-nci_i2c @@ -2375,7 +2369,6 @@ parport_ax88796 parport_pc pata_of_platform pata_platform -pblk pc87360 pc87427 pcap-regulator @@ -2740,7 +2733,6 @@ rpisense-fb rpisense-js rpmsg_core rpr0521 -rrpc rsi_91x rsi_sdio rsi_usb diff --git a/debian.raspi2/config/config.common.ubuntu b/debian.raspi2/config/config.common.ubuntu index 3a51daf7a9dd..f593ccaabe11 100644 --- a/debian.raspi2/config/config.common.ubuntu +++ b/debian.raspi2/config/config.common.ubuntu @@ -4224,19 +4224,10 @@ CONFIG_NR_CPUS=4 CONFIG_NTFS_FS=m CONFIG_NTFS_RW=y # CONFIG_NUMA is not set -CONFIG_NVM=y +# CONFIG_NVM is not set CONFIG_NVMEM=y -CONFIG_NVME_CORE=m -CONFIG_NVME_FABRICS=m -CONFIG_NVME_FC=m -# CONFIG_NVME_MULTIPATH is not set -CONFIG_NVME_TARGET=m -CONFIG_NVME_TARGET_FC=m -# CONFIG_NVME_TARGET_FCLOOP is not set -CONFIG_NVME_TARGET_LOOP=m -# CONFIG_NVM_DEBUG is not set -CONFIG_NVM_PBLK=m -CONFIG_NVM_RRPC=m +# CONFIG_NVME_FC is not set +# CONFIG_NVME_TARGET is not set CONFIG_NVRAM=m CONFIG_N_GSM=m CONFIG_N_HDLC=m