From patchwork Wed Apr 3 17:52:41 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kamal Mostafa X-Patchwork-Id: 1076249 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 44ZDFM4wCnz9sPb; Thu, 4 Apr 2019 04:52:55 +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 1hBk46-000582-IE; Wed, 03 Apr 2019 17:52:46 +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 1hBk45-00057v-J3 for kernel-team@lists.ubuntu.com; Wed, 03 Apr 2019 17:52:45 +0000 Received: from 1.general.kamal.us.vpn ([10.172.68.52] helo=fourier) by youngberry.canonical.com with esmtpsa (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.76) (envelope-from ) id 1hBk44-0007ZD-Vk for kernel-team@lists.ubuntu.com; Wed, 03 Apr 2019 17:52:45 +0000 Received: from kamal by fourier with local (Exim 4.90_1) (envelope-from ) id 1hBk42-0006e4-DH for kernel-team@lists.ubuntu.com; Wed, 03 Apr 2019 10:52:42 -0700 From: Kamal Mostafa To: kernel-team@lists.ubuntu.com Subject: [PATCH][linux-aws/Xenial] UBUNTU: aws: [Config] make CONFIG_BLK_DEV_NVME, NVMEM builtin Date: Wed, 3 Apr 2019 10:52:41 -0700 Message-Id: <20190403175241.25501-1-kamal@canonical.com> X-Mailer: git-send-email 2.17.1 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/1823045 Required for support of hibernation to nvme devices. Signed-off-by: Kamal Mostafa Acked-by: Khalid Elmously Acked-By: You-Sheng Yang --- debian.aws/abi/4.4.0-1078.88/amd64/aws.modules | 2 -- debian.aws/config/config.common.ubuntu | 4 ++-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/debian.aws/abi/4.4.0-1078.88/amd64/aws.modules b/debian.aws/abi/4.4.0-1078.88/amd64/aws.modules index 9c95d3777b68..d9f6d5a8edce 100644 --- a/debian.aws/abi/4.4.0-1078.88/amd64/aws.modules +++ b/debian.aws/abi/4.4.0-1078.88/amd64/aws.modules @@ -1744,8 +1744,6 @@ ntfs null_blk nv_tco nvidiafb -nvme -nvmem_core nvram nxp-nci nxp-nci_i2c diff --git a/debian.aws/config/config.common.ubuntu b/debian.aws/config/config.common.ubuntu index 6ce736dc849d..0b1a596fd1a4 100644 --- a/debian.aws/config/config.common.ubuntu +++ b/debian.aws/config/config.common.ubuntu @@ -477,7 +477,7 @@ CONFIG_BLK_DEV_LOOP_MIN_COUNT=8 CONFIG_BLK_DEV_MD=y CONFIG_BLK_DEV_NBD=m CONFIG_BLK_DEV_NULL_BLK=m -CONFIG_BLK_DEV_NVME=m +CONFIG_BLK_DEV_NVME=y CONFIG_BLK_DEV_NVME_SCSI=y CONFIG_BLK_DEV_OSD=m CONFIG_BLK_DEV_PCIESSD_MTIP32XX=m @@ -3352,7 +3352,7 @@ CONFIG_NUMA_BALANCING_DEFAULT_ENABLED=y # CONFIG_NUMA_EMU is not set CONFIG_NVDIMM_PFN=y CONFIG_NVM=y -CONFIG_NVMEM=m +CONFIG_NVMEM=y # CONFIG_NVME_VENDOR_EXT_GOOGLE is not set # CONFIG_NVM_DEBUG is not set CONFIG_NVM_GENNVM=m