From patchwork Thu Jan 11 10:28:52 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Bader X-Patchwork-Id: 1885457 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ubuntu.com (client-ip=185.125.189.65; helo=lists.ubuntu.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=patchwork.ozlabs.org) Received: from lists.ubuntu.com (lists.ubuntu.com [185.125.189.65]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4T9grP38Fpz1yPm for ; Thu, 11 Jan 2024 21:29:09 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=lists.ubuntu.com) by lists.ubuntu.com with esmtp (Exim 4.86_2) (envelope-from ) id 1rNsIz-0001W6-AT; Thu, 11 Jan 2024 10:28:57 +0000 Received: from smtp-relay-canonical-1.internal ([10.131.114.174] helo=smtp-relay-canonical-1.canonical.com) by lists.ubuntu.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1rNsIw-0001Vl-JX for kernel-team@lists.ubuntu.com; Thu, 11 Jan 2024 10:28:54 +0000 Received: from canonical.com (2.general.smb.uk.vpn [10.172.193.29]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-canonical-1.canonical.com (Postfix) with ESMTPSA id 21EA84300A for ; Thu, 11 Jan 2024 10:28:54 +0000 (UTC) From: Stefan Bader To: kernel-team@lists.ubuntu.com Subject: [PATCH 1/1][SRU M/N/U] UBUNTU: [Config] Enable S390_UV_UAPI (built-in) Date: Thu, 11 Jan 2024 11:28:52 +0100 Message-Id: <20240111102852.61596-2-stefan.bader@canonical.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240111102852.61596-1-stefan.bader@canonical.com> References: <20240111102852.61596-1-stefan.bader@canonical.com> MIME-Version: 1.0 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: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" 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 --- debian.master/config/annotations | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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'}>