From patchwork Fri Aug 24 17:16:52 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joseph Salisbury X-Patchwork-Id: 961962 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-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 41xnyR0HXWz9s4s; Sat, 25 Aug 2018 03:17:03 +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 1ftFhg-0004EY-FZ; Fri, 24 Aug 2018 17:16:56 +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 1ftFhd-0004Dd-TH for kernel-team@lists.ubuntu.com; Fri, 24 Aug 2018 17:16:53 +0000 Received: from 1.general.jsalisbury.us.vpn ([10.172.67.212] helo=salisbury) by youngberry.canonical.com with esmtpsa (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.76) (envelope-from ) id 1ftFhd-0004jq-J2 for kernel-team@lists.ubuntu.com; Fri, 24 Aug 2018 17:16:53 +0000 Received: by salisbury (Postfix, from userid 1000) id 7469F7E0421; Fri, 24 Aug 2018 13:16:52 -0400 (EDT) From: Joseph Salisbury To: kernel-team@lists.ubuntu.com Subject: [SRU][Bionic][PATCH 1/1] UBUNTU: [Config] CONFIG_SCLP_OFB=y for s390x Date: Fri, 24 Aug 2018 13:16:52 -0400 Message-Id: X-Mailer: git-send-email 2.17.1 In-Reply-To: References: In-Reply-To: References: 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" From: Seth Forshee BugLink: https://bugs.launchpad.net/bugs/1787898 This is required for booting an IBM Secure Service Container Appliance in an s390 LPAR. Signed-off-by: Seth Forshee Signed-off-by: Joseph Salisbury --- debian.master/config/annotations | 3 ++- debian.master/config/config.common.ubuntu | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/debian.master/config/annotations b/debian.master/config/annotations index 5d8144b..2b8d43f 100644 --- a/debian.master/config/annotations +++ b/debian.master/config/annotations @@ -778,7 +778,7 @@ CONFIG_SCLP_VT220_CONSOLE policy<{'s390x': 'y'}> CONFIG_SCLP_ASYNC policy<{'s390x': 'm'}> CONFIG_SCLP_ASYNC_ID policy<{'s390x': '"000000000"'}> CONFIG_HMC_DRV policy<{'s390x': 'm'}> -CONFIG_SCLP_OFB policy<{'s390x': 'n'}> +CONFIG_SCLP_OFB policy<{'s390x': 'y'}> CONFIG_S390_TAPE policy<{'s390x': 'm'}> CONFIG_S390_TAPE_34XX policy<{'s390x': 'm'}> CONFIG_S390_TAPE_3590 policy<{'s390x': 'm'}> @@ -794,6 +794,7 @@ CONFIG_XILLYBUS_OF policy<{'arm64': 'm', 'armhf': ' # CONFIG_DEVKMEM mark note CONFIG_HVC_UDBG mark note +CONFIG_SCLP_OFB mark note # Menu: Device Drivers >> Character devices >> Enable TTY CONFIG_TTY policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'ppc64el': 'y', 's390x': 'y'}> diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu index 385e735..db4b73d 100644 --- a/debian.master/config/config.common.ubuntu +++ b/debian.master/config/config.common.ubuntu @@ -7667,7 +7667,7 @@ CONFIG_SCIF_BUS=m CONFIG_SCLP_ASYNC=m CONFIG_SCLP_ASYNC_ID="000000000" CONFIG_SCLP_CONSOLE=y -# CONFIG_SCLP_OFB is not set +CONFIG_SCLP_OFB=y CONFIG_SCLP_TTY=y CONFIG_SCLP_VT220_CONSOLE=y CONFIG_SCLP_VT220_TTY=y