From patchwork Thu Oct 12 18:53:29 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joseph Salisbury X-Patchwork-Id: 1847735 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 4S5zLl21bdz23jX for ; Fri, 13 Oct 2023 05:53:50 +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 1qr0oW-00031D-Gk; Thu, 12 Oct 2023 18:53:40 +0000 Received: from smtp-relay-canonical-0.internal ([10.131.114.83] helo=smtp-relay-canonical-0.canonical.com) by lists.ubuntu.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1qr0oQ-00030u-T8 for kernel-team@lists.ubuntu.com; Thu, 12 Oct 2023 18:53:36 +0000 Received: from smtp.gmail.com (1.general.jsalisbury.us.vpn [10.172.66.188]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-canonical-0.canonical.com (Postfix) with ESMTPSA id 3DD4640100 for ; Thu, 12 Oct 2023 18:53:33 +0000 (UTC) From: Joseph Salisbury To: kernel-team@lists.ubuntu.com Subject: [SRU][Jammy][PATCH 1/1] UBUNTU: [Packaging] Make WWAN driver loadable modules Date: Thu, 12 Oct 2023 14:53:29 -0400 Message-Id: <20231012185329.283521-2-joseph.salisbury@canonical.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231012185329.283521-1-joseph.salisbury@canonical.com> References: <20231012185329.283521-1-joseph.salisbury@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/2033406 The CONFIG_WWAN config is set to 'Y' for the generic and most derivative kernels. This is affecting custom driver development for some partners. Change this config to be a loadable module and include it in linux-modules-*. Make this change to -generic kernels, so all derivatives will inherit it. Signed-off-by: Joseph Salisbury --- debian.master/config/annotations | 3 +++ debian.master/control.d/generic.inclusion-list | 1 + 2 files changed, 4 insertions(+) diff --git a/debian.master/config/annotations b/debian.master/config/annotations index 719e7709ce66..8ad52d29e9e2 100644 --- a/debian.master/config/annotations +++ b/debian.master/config/annotations @@ -825,6 +825,9 @@ CONFIG_ZLIB_DFLTCC note<'LP:1830208'> CONFIG_ZONE_DMA policy<{'amd64': 'y', 'arm64': 'y', 'armhf-generic-lpae': 'y', 's390x': 'y'}> CONFIG_ZONE_DMA note<'LP:1628523'> +CONFIG_WWAN policy<{'amd64': 'm', 'arm64': 'm'}> +CONFIG_WWAN note<'LP: #2033406'> + # ---- Annotations without notes ---- diff --git a/debian.master/control.d/generic.inclusion-list b/debian.master/control.d/generic.inclusion-list index 9b9bd7c35ae0..b0a9d896fd7f 100644 --- a/debian.master/control.d/generic.inclusion-list +++ b/debian.master/control.d/generic.inclusion-list @@ -147,6 +147,7 @@ drivers/net/virtio_net.ko drivers/net/vmxnet3/vmxnet3.ko drivers/net/vxlan.ko drivers/net/wireguard/wireguard.ko +drivers/net/wwan/* drivers/net/xen-netback/* drivers/net/xen-netfront.ko drivers/nvme/host/nvme.ko