diff mbox series

[1/1,SRU,M/N/U] UBUNTU: [Config] Enable S390_UV_UAPI (built-in)

Message ID 20240111102852.61596-2-stefan.bader@canonical.com
State New
Headers show
Series Fix secure execution regression on s390x | expand

Commit Message

Stefan Bader Jan. 11, 2024, 10:28 a.m. UTC
BugLink: https://bugs.launchpad.net/bugs/2048919

In 22.04/Jammy LTS this driver was backported post-release and enabled
(built-in) but since this happened after release the config change got
missed on later releases. Enable it again as it was in 22.04.

Signed-off-by: Stefan Bader <stefan.bader@canonical.com>
---
 debian.master/config/annotations | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
diff mbox series

Patch

diff --git a/debian.master/config/annotations b/debian.master/config/annotations
index b2827399baf6..280549aed224 100644
--- a/debian.master/config/annotations
+++ b/debian.master/config/annotations
@@ -531,6 +531,9 @@  CONFIG_RUST                                     note<'required to enable Rust su
 CONFIG_RUST_IS_AVAILABLE                        policy<{'amd64': 'y', 'arm64': '-', 'armhf': '-', 'ppc64el': '-', 'riscv64': '-', 's390x': '-'}>
 CONFIG_RUST_IS_AVAILABLE                        note<'required to enable Rust support, LP: #1993183'>
 
+CONFIG_S390_UV_UAPI                             policy<{'s390x': 'y'}>
+CONFIG_S390_UV_UAPI                             note<'LP: #2048919'>
+
 CONFIG_SAMPLE_TRACE_PRINTK                      policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm', 'riscv64': 'm', 's390x': 'm'}>
 CONFIG_SAMPLE_TRACE_PRINTK                      note<'Required for ftrace selftests'>
 
@@ -11133,7 +11136,6 @@  CONFIG_S390_PRNG                                policy<{'s390x': 'm'}>
 CONFIG_S390_TAPE                                policy<{'s390x': 'm'}>
 CONFIG_S390_TAPE_34XX                           policy<{'s390x': 'm'}>
 CONFIG_S390_TAPE_3590                           policy<{'s390x': 'm'}>
-CONFIG_S390_UV_UAPI                             policy<{'s390x': 'n'}>
 CONFIG_S390_VMUR                                policy<{'s390x': 'm'}>
 CONFIG_S3C2410_WATCHDOG                         policy<{'armhf': 'n'}>
 CONFIG_S5P_DEV_MFC                              policy<{'armhf': 'y'}>