APPLIED: [PATCH 1/1][Bionic] UBUNTU: [Config] CONFIG_SCLP_OFB=y for s390x

[Kleber Souza]

On 08/24/18 15:42, Seth Forshee wrote:
> 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 at canonical.com>
> ---
>  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 5d8144bfba41..2b8d43f08de2 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 2a0a4c1969de..9f8343294956 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
> 

Applied to bionic/master-next branch.

Thanks,
Kleber