diff mbox series

[SRU,Bionic,1/1] UBUNTU: [Config] CONFIG_SCLP_OFB=y for s390x

Message ID b934fb3cafda96fc9eb72d14322905a169b7557a.1535130750.git.joseph.salisbury@canonical.com
State New
Headers show
Series UBUNTU: [Config] CONFIG_SCLP_OFB=y for s390x | expand

Commit Message

Joseph Salisbury Aug. 24, 2018, 5:16 p.m. UTC 
From: Seth Forshee <seth.forshee@canonical.com>

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 <seth.forshee@canonical.com>
Signed-off-by: Joseph Salisbury <joseph.salisbury@canonical.com>
---
 debian.master/config/annotations          | 3 ++-
 debian.master/config/config.common.ubuntu | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)
diff mbox series

Patch

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<ENFORCED> note</dev/kmem is a large attack vector>
 CONFIG_HVC_UDBG                                 mark<ENFORCED> note<LP#1680888>
+CONFIG_SCLP_OFB                                 mark<ENFORCED> note<LP:1787898>
 
 # 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