[SRU][J][PATCH 3/3] UBUNTU: [Config] CONFIG_S390_UV_UAPI=y for s390x

[frank.heimes at canonical.com]

From: Frank Heimes <frank.heimes at canonical.com>

BugLink: https://bugs.launchpad.net/bugs/1959973

With commit "drivers/s390/char: Add Ultravisor io device"
a new misc character device to expose some Ultravisor
functions to userspace is added which provides attestations support.
This commit activated the corresponding kernel config option.

Signed-off-by: Frank Heimes <frank.heimes at canonical.com>
---
 debian.master/config/annotations          | 2 ++
 debian.master/config/config.common.ubuntu | 1 +
 2 files changed, 3 insertions(+)

diff --git a/debian.master/config/annotations b/debian.master/config/annotations
index b940ce782a35..94babf7e345b 100644
--- a/debian.master/config/annotations
+++ b/debian.master/config/annotations
@@ -775,6 +775,7 @@ CONFIG_VMCP_CMA_SIZE                            policy<{'s390x': '4'}>
 CONFIG_MONREADER                                policy<{'s390x': 'm'}>
 CONFIG_MONWRITER                                policy<{'s390x': 'm'}>
 CONFIG_S390_VMUR                                policy<{'s390x': 'm'}>
+CONFIG_S390_UV_UAPI                             policy<{'s390x': 'y'}>
 CONFIG_XILLYBUS                                 policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm', 's390x': 'n'}>
 CONFIG_XILLYBUS_PCIE                            policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm'}>
 CONFIG_XILLYBUS_OF                              policy<{'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm'}>
@@ -782,6 +783,7 @@ CONFIG_XILLYUSB                                 policy<{'amd64': 'm', 'arm64': '
 #
 CONFIG_NVRAM                                    mark<ENFORCED> note<LP#1837726>
 CONFIG_SCLP_OFB                                 mark<ENFORCED> note<LP:1787898>
+CONFIG_S390_UV_UAPI                             mark<ENFORCED> note<LP:1959973>
 
 # Menu: Device Drivers >> Character devices >> Enable TTY
 CONFIG_NULL_TTY                                 policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm', 's390x': 'n'}>
diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index c6203ddf0475..917a9b68bdbc 100644
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -9143,6 +9143,7 @@ CONFIG_S390_TAPE=m
 CONFIG_S390_TAPE_34XX=m
 CONFIG_S390_TAPE_3590=m
 # CONFIG_S390_UNWIND_SELFTEST is not set
+CONFIG_S390_UV_UAPI=y
 CONFIG_S390_VMUR=m
 CONFIG_S3C2410_WATCHDOG=m
 CONFIG_S5P_DEV_MFC=y
-- 
2.34.1