From patchwork Tue Oct 22 13:40:06 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dimitri John Ledkov X-Patchwork-Id: 1181332 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=none (p=none dis=none) header.from=ubuntu.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; secure) header.d=surgut.co.uk header.i=@surgut.co.uk header.b="XE4Fpe7m"; dkim-atps=neutral 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 46yF4q3NGbz9sPf; Wed, 23 Oct 2019 00:40:27 +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 1iMuOc-0007ws-Dn; Tue, 22 Oct 2019 13:40:22 +0000 Received: from mail-wr1-f50.google.com ([209.85.221.50]) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1iMuOa-0007wm-FV for kernel-team@lists.ubuntu.com; Tue, 22 Oct 2019 13:40:20 +0000 Received: by mail-wr1-f50.google.com with SMTP id q13so13148915wrs.12 for ; Tue, 22 Oct 2019 06:40:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=surgut.co.uk; s=google; h=sender:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=RJhOfaK4N9iVzs0tMP6JHWD40zERB9V0L7inM8/yYMY=; b=XE4Fpe7mbMVJFKtB3DPLJyk0yn5rUvykVX5chwp7DzCf2KKw0C8BZW3xGZqJuPfQiY kJH5GmkDfH0XVHZrYGv73GDngVx2WdVmdzk8MQUbSO7o4kCmxY2arF4Bma8Kds0qkZvp zrO2ulR2DE8wXK+dwSdYyaCXuDXs7sqK2TgLI= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :mime-version:content-transfer-encoding; bh=RJhOfaK4N9iVzs0tMP6JHWD40zERB9V0L7inM8/yYMY=; b=RlxtjRFfYLeG84cGNKZie6F7MRRAceopDkAQeOe8iM+iBOvq/ZYAKHFoE4WpA8r9NZ 9upIoRGRpM5o5riEt+pJdIXmOmjYWgym267yNMv4wJ8e1xPv8UM6BftU+fUEsn4EGaBX SRtT9oW31dMuubZ4NzqhlyH858OzVJm31O6Ya4QO1S+Ba1RVGzG6ggg1aHpqkjMENSMR rg4EutM+oprHbH3hawy3J5HBwsf2UiVqge4rEQ1Zv0dYa19GaJejN4oyXYFTVsypLlll 31xOHZfSEkg/nuLpPuxJ7Be7n24nFw1v36wlV3BSb9YveCd6x6EnQP+6wLZcclvI7Exq Jb9g== X-Gm-Message-State: APjAAAV7LLdHCKPTS+itsUIF3njTuNtKCDjXvsLUTkT04GV//BbXOU3S pP1ySr3feCxO9U4J/5FO/p+TE9IouU4= X-Google-Smtp-Source: APXvYqwQBG3/18R0htGPw8xTF4StPBilW6bSj7PEG4En23qich3Jq8RVAjnDfP6aTP+82f3cJ4tvCQ== X-Received: by 2002:a5d:464f:: with SMTP id j15mr3611990wrs.366.1571751619653; Tue, 22 Oct 2019 06:40:19 -0700 (PDT) Received: from localhost (9.a.8.f.7.f.e.f.f.f.2.3.f.4.a.1.1.4.e.1.c.6.e.d.0.b.8.0.1.0.0.2.ip6.arpa. [2001:8b0:de6c:1e41:1a4f:32ff:fef7:f8a9]) by smtp.gmail.com with ESMTPSA id h205sm665482wmf.35.2019.10.22.06.40.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 22 Oct 2019 06:40:18 -0700 (PDT) From: Dimitri John Ledkov To: kernel-team@lists.ubuntu.com Subject: [PATCH][FOCAL] UBUNTU: [Config] s390x bump march to z13, with tune to z15 Date: Tue, 22 Oct 2019 14:40:06 +0100 Message-Id: <20191022134006.13040-1-xnox@ubuntu.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 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: , Cc: Dimitri John Ledkov Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" BugLink: https://bugs.launchpad.net/bugs/1837525 Signed-off-by: Dimitri John Ledkov --- debian.master/config/annotations | 8 ++++---- debian.master/config/config.common.ubuntu | 11 ++++++----- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/debian.master/config/annotations b/debian.master/config/annotations index 029af6a836cb..947a5b12f9c3 100644 --- a/debian.master/config/annotations +++ b/debian.master/config/annotations @@ -12647,8 +12647,8 @@ CONFIG_MARCH_Z990 policy<{'s390x': 'n'}> CONFIG_MARCH_Z9_109 policy<{'s390x': 'n'}> CONFIG_MARCH_Z10 policy<{'s390x': 'n'}> CONFIG_MARCH_Z196 policy<{'s390x': 'n'}> -CONFIG_MARCH_ZEC12 policy<{'s390x': 'y'}> -CONFIG_MARCH_Z13 policy<{'s390x': 'n'}> +CONFIG_MARCH_ZEC12 policy<{'s390x': 'n'}> +CONFIG_MARCH_Z13 policy<{'s390x': 'y'}> CONFIG_MARCH_Z14 policy<{'s390x': 'n'}> CONFIG_MARCH_Z15 policy<{'s390x': 'n'}> @@ -12724,10 +12724,10 @@ CONFIG_TUNE_Z990 policy<{'s390x': 'n'}> CONFIG_TUNE_Z9_109 policy<{'s390x': 'n'}> CONFIG_TUNE_Z10 policy<{'s390x': 'n'}> CONFIG_TUNE_Z196 policy<{'s390x': 'n'}> -CONFIG_TUNE_ZEC12 policy<{'s390x': 'y'}> +CONFIG_TUNE_ZEC12 policy<{'s390x': 'n'}> CONFIG_TUNE_Z13 policy<{'s390x': 'n'}> CONFIG_TUNE_Z14 policy<{'s390x': 'n'}> -CONFIG_TUNE_Z15 policy<{'s390x': 'n'}> +CONFIG_TUNE_Z15 policy<{'s390x': 'y'}> # Menu: Processor type and features >> Virtual address space size >> Architecture: arm64 CONFIG_ARM64_VA_BITS_39 policy<{'arm64': 'n'}> diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu index 3f70cc72650f..1098fbdc8c0f 100644 --- a/debian.master/config/config.common.ubuntu +++ b/debian.master/config/config.common.ubuntu @@ -3792,6 +3792,7 @@ CONFIG_HAVE_KVM_VCPU_RUN_PID_CHANGE=y CONFIG_HAVE_LD_DEAD_CODE_DATA_ELIMINATION=y CONFIG_HAVE_LIVEPATCH=y CONFIG_HAVE_MARCH_Z10_FEATURES=y +CONFIG_HAVE_MARCH_Z13_FEATURES=y CONFIG_HAVE_MARCH_Z196_FEATURES=y CONFIG_HAVE_MARCH_Z900_FEATURES=y CONFIG_HAVE_MARCH_Z990_FEATURES=y @@ -5340,15 +5341,15 @@ CONFIG_MANAGER_SBS=m CONFIG_MANDATORY_FILE_LOCKING=y CONFIG_MANTIS_CORE=m # CONFIG_MARCH_Z10 is not set -# CONFIG_MARCH_Z13 is not set +CONFIG_MARCH_Z13=y # CONFIG_MARCH_Z14 is not set # CONFIG_MARCH_Z15 is not set +CONFIG_MARCH_Z15_TUNE=y # CONFIG_MARCH_Z196 is not set # CONFIG_MARCH_Z900 is not set # CONFIG_MARCH_Z990 is not set # CONFIG_MARCH_Z9_109 is not set -CONFIG_MARCH_ZEC12=y -CONFIG_MARCH_ZEC12_TUNE=y +# CONFIG_MARCH_ZEC12 is not set CONFIG_MARVELL_10G_PHY=m CONFIG_MARVELL_PHY=m # CONFIG_MATH_EMULATION is not set @@ -10242,12 +10243,12 @@ CONFIG_TUN=y # CONFIG_TUNE_Z10 is not set # CONFIG_TUNE_Z13 is not set # CONFIG_TUNE_Z14 is not set -# CONFIG_TUNE_Z15 is not set +CONFIG_TUNE_Z15=y # CONFIG_TUNE_Z196 is not set # CONFIG_TUNE_Z900 is not set # CONFIG_TUNE_Z990 is not set # CONFIG_TUNE_Z9_109 is not set -CONFIG_TUNE_ZEC12=y +# CONFIG_TUNE_ZEC12 is not set # CONFIG_TUN_VNET_CROSS_LE is not set CONFIG_TURRIS_MOX_RWTM=m CONFIG_TWL4030_CORE=y