From patchwork Tue Apr 23 18:19:38 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daan De Meyer X-Patchwork-Id: 1926933 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 4VPTGd4LH1z23hs for ; Wed, 24 Apr 2024 16:14:32 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=lists.ubuntu.com) by lists.ubuntu.com with esmtp (Exim 4.86_2) (envelope-from ) id 1rzVtd-0003y2-6G; Wed, 24 Apr 2024 06:14:21 +0000 Received: from mail-ed1-f48.google.com ([209.85.208.48]) by lists.ubuntu.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1rzKko-0001lA-JG for kernel-team@lists.ubuntu.com; Tue, 23 Apr 2024 18:20:30 +0000 Received: by mail-ed1-f48.google.com with SMTP id 4fb4d7f45d1cf-565c6cf4819so235354a12.1 for ; Tue, 23 Apr 2024 11:20:30 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1713896429; x=1714501229; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=F7KVe9HaeTnbiQjVSebUjWSLl64/X0SO8ILWZ2psjWk=; b=El3JuJHudjqhOR/H1Ej//s9bvpLDYxxexnVE4UOEh1fxKMMpGWH6Zqm+y0xamtQBob tgUYYAaz2ZFumJV1Syikgpj2qPqo33B3m9JWj3E31yKiuXxoECztM8JcGS0duMKTHBH7 p8vttieiZcPweKmBZ5WFNcKvmuAFM0PUSeyYixuvJ8LTzUFkE67u7mFGG6vzOPV5T4L2 FNgXMZjnYBrja8EF/mjDDT83/b8VP5A6eptiCvk0YpoJIg0pK/SRiilcP8PNicUrqmDU zj3eRseajz5dE8RPPXbbkxPqHYRQfI1K/KN6jU963owYCo+ZTZsye+GjsfIhba2gS44Q gCWg== X-Gm-Message-State: AOJu0YzC4uSqmn242/gOqbzp0wPIehuBEkLUz7ZAXhxzplLn2poyqxM5 0P9QFirOuPWj+6ue4H2RFe/+UcJfcXKqIDgNxu9IZI8F9w8b0yEUJoxoYA== X-Google-Smtp-Source: AGHT+IG1/fu0xAUBq0mJWokja2DuKEyJXwAPAumnV2sj6FgRbyUtlJ/e6cEyJvX97/+hfgBNm8ID1w== X-Received: by 2002:a17:907:778c:b0:a55:5958:cb00 with SMTP id ky12-20020a170907778c00b00a555958cb00mr3261132ejc.38.1713896429270; Tue, 23 Apr 2024 11:20:29 -0700 (PDT) Received: from localhost.localdomain ([2a02:a03f:864b:8201:e534:34f4:1c34:8de7]) by smtp.googlemail.com with ESMTPSA id jy2-20020a170907762200b00a55bb9704d2sm2424879ejc.102.2024.04.23.11.20.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 Apr 2024 11:20:29 -0700 (PDT) From: Daan De Meyer To: kernel-team@lists.ubuntu.com Subject: [PATCH 1/1] Include scsi_debug/nvmet-tcp in linux-modules instead of linux-modules-extra Date: Tue, 23 Apr 2024 20:19:38 +0200 Message-ID: <20240423182009.1117677-2-daan.j.demeyer@gmail.com> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240423182009.1117677-1-daan.j.demeyer@gmail.com> References: <20240423182009.1117677-1-daan.j.demeyer@gmail.com> MIME-Version: 1.0 Received-SPF: pass client-ip=209.85.208.48; envelope-from=daan.j.demeyer@gmail.com; helo=mail-ed1-f48.google.com X-Mailman-Approved-At: Wed, 24 Apr 2024 06:14:19 +0000 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: , Cc: Daan De Meyer Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" The scsi_debug.ko and nvmet-tcp.ko modules are currently shipped in linux-modules-extra. This makes it hard to pull them in via the linux-virtual package, it can only come from the linux-generic one that also pulls in the firmware and everything else needed for baremetal, and that serves no purpose in a qemu VM. This stops VMs using these kernels from using these modules. These modules are required to run the systemd integration tests which we are trying to run in VMs on Github Actions (https://github.com/systemd/systemd/pull/32439). --- debian.master/control.d/generic.inclusion-list | 2 ++ 1 file changed, 2 insertions(+) diff --git a/debian.master/control.d/generic.inclusion-list b/debian.master/control.d/generic.inclusion-list index af4d7381fdc9..ff4936f728ce 100644 --- a/debian.master/control.d/generic.inclusion-list +++ b/debian.master/control.d/generic.inclusion-list @@ -152,6 +152,7 @@ drivers/net/wwan/* drivers/net/xen-netback/* drivers/net/xen-netfront.ko drivers/nvme/host/nvme.ko +drivers/nvme/target/nvmet-tcp.ko drivers/nvmem/nvmem_core.ko drivers/parport/parport.ko drivers/parport/parport_pc.ko @@ -192,6 +193,7 @@ drivers/scsi/osd/osd.ko drivers/scsi/qla1280.ko drivers/scsi/qla2xxx/* drivers/scsi/raid_class.ko +drivers/scsi/scsi_debug.ko drivers/scsi/scsi_transport_fc.ko drivers/scsi/scsi_transport_iscsi.ko drivers/scsi/scsi_transport_sas.ko