From patchwork Fri Oct 18 07:05:21 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Frank Heimes X-Patchwork-Id: 1179157 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 46vcW40Ncjz9sPZ; Fri, 18 Oct 2019 18:05:35 +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 1iLMKK-0004Xa-JQ; Fri, 18 Oct 2019 07:05:32 +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 1iLMKI-0004Wi-Kp for kernel-team@lists.ubuntu.com; Fri, 18 Oct 2019 07:05:30 +0000 Received: from 2.general.fheimes.uk.vpn ([10.172.194.67] helo=localhost.localdomain) by youngberry.canonical.com with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_CBC_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1iLMKI-00030j-EV for kernel-team@lists.ubuntu.com; Fri, 18 Oct 2019 07:05:30 +0000 From: frank.heimes@canonical.com To: kernel-team@lists.ubuntu.com Subject: [SRU][Bionic][Disco][Eoan][Patch 1/1] UBUNTU: [Config] Change Config Option CONFIG_MEMORY_HOTPLUG_DEFAULT_ONLINE for s390x from yes to no Date: Fri, 18 Oct 2019 09:05:21 +0200 Message-Id: <1571382321-13220-2-git-send-email-frank.heimes@canonical.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1571382321-13220-1-git-send-email-frank.heimes@canonical.com> References: <1571382321-13220-1-git-send-email-frank.heimes@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/1848492 Signed-off-by: Frank Heimes Acked-by: Kleber Sacilotto de Souza Acked-by: Stefan Bader --- debian.master/config/annotations | 4 ++-- debian.master/config/s390x/config.common.s390x | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/debian.master/config/annotations b/debian.master/config/annotations index 43016a9..22ddb2b 100644 --- a/debian.master/config/annotations +++ b/debian.master/config/annotations @@ -11165,12 +11165,12 @@ CONFIG_ARM64_PMEM policy<{'arm64': 'y'}> # Menu: Processor type and features >> Allow for memory hot-add CONFIG_MEMORY_HOTPLUG policy<{'amd64': 'y', 'i386': 'y', 'ppc64el': 'y', 's390x': 'y'}> -CONFIG_MEMORY_HOTPLUG_DEFAULT_ONLINE policy<{'amd64': 'y', 'i386': 'y', 'ppc64el': 'n', 's390x': 'y'}> +CONFIG_MEMORY_HOTPLUG_DEFAULT_ONLINE policy<{'amd64': 'y', 'i386': 'y', 'ppc64el': 'n', 's390x': 'n'}> CONFIG_MEMORY_HOTREMOVE policy<{'amd64': 'y', 'i386': 'y', 'ppc64el': 'y', 's390x': 'y'}> CONFIG_DEFERRED_STRUCT_PAGE_INIT policy<{'amd64': 'n', 'i386': 'n', 'ppc64el': 'n', 's390x': 'n'}> CONFIG_ZONE_DEVICE policy<{'amd64': 'y', 'ppc64el': 'y'}> # -CONFIG_MEMORY_HOTPLUG_DEFAULT_ONLINE mark note +CONFIG_MEMORY_HOTPLUG_DEFAULT_ONLINE mark note # Menu: Processor type and features >> Architecture: arm CONFIG_HAVE_ARM_ARCH_TIMER policy<{'armhf': 'y'}> diff --git a/debian.master/config/s390x/config.common.s390x b/debian.master/config/s390x/config.common.s390x index 00e4ce1..afbe49820 100644 --- a/debian.master/config/s390x/config.common.s390x +++ b/debian.master/config/s390x/config.common.s390x @@ -177,7 +177,7 @@ CONFIG_MD_MULTIPATH=y # CONFIG_MEGARAID_NEWGEN is not set # CONFIG_MEGARAID_SAS is not set # CONFIG_MEMORY is not set -CONFIG_MEMORY_HOTPLUG_DEFAULT_ONLINE=y +# CONFIG_MEMORY_HOTPLUG_DEFAULT_ONLINE is not set # CONFIG_MEMSTICK is not set CONFIG_MEM_SOFT_DIRTY=y CONFIG_MFD_CORE=m