From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 1D2ED342CA7; Sat, 30 May 2026 17:51:58 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780163519; cv=none; b=GWVOry/HekQtYJ+ePhLv0uWAxKhbSK+nf57L90P8cuvQauauzyHJK3xKvdzO5WkBoZwPf3f6cJjG8E1sqL+Mq9TPu77Eg+6GTPa405vUtP2RbEJOWf8CDec+otjmOXRA02aCsi9+BtDTj2+X8QtFrx9sOVNBDGcSrH5vhBwzaXw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780163519; c=relaxed/simple; bh=slnpEI9J4MIZMGFQH6jKi3Q63WQTGZzOeTfkRb+ekPg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=i8ObDo37TE2K4BttAbFDCHUBF9Binq8AKpwnXT4CnzQs/rUEPU3IgK/WkQmcJpMf/9w9Qp0oMSRSAJNXggThk2GeE6yLfqx8lqMf45z2Q5wl4YipVysXHdWRJIM2PSa+euv/cY+bgZ6xOKlmLgfaSh7yeDjPYQ1zcoNRYaZusHQ= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=qIPAvoeC; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="qIPAvoeC" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 625721F00893; Sat, 30 May 2026 17:51:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1780163518; bh=Cj1B6bYF4tw9XRg0RvG7+40486V6q1saGmzfyL6UjfU=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=qIPAvoeCAW2U8ITXRYA25OjTU05W/ykDmZXkYeH3zXZ8vj9JHVcaijJklHEkjqRzr 7gE/aWvo7POYZwmeJNb+s70GsUzccPpIrqyP9z5/awRMEwvcApRW56ENMVOvtcROL7 +GoZteGVHhT/EY9eUhhwc0/+Y5AfIK/Uro4c2nuo= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Florian Fainelli , Sasha Levin Subject: [PATCH 5.15 282/776] um: virt-pci: Fix build failure Date: Sat, 30 May 2026 17:59:56 +0200 Message-ID: <20260530160247.845443520@linuxfoundation.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260530160240.228940103@linuxfoundation.org> References: <20260530160240.228940103@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 5.15-stable review patch. If anyone has any objections, please let me know. ------------------ From: Florian Fainelli Commit a27e95a6ff3f ("um: virt-pci: properly remove PCI device from bus") assumed that virtio_reset_device() is present in the 5.15.y kernel but it is not and so backport would now cause a build failure. Fixes: a27e95a6ff3f ("um: virt-pci: properly remove PCI device from bus") Signed-off-by: Florian Fainelli Signed-off-by: Sasha Levin --- arch/um/drivers/virt-pci.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/um/drivers/virt-pci.c b/arch/um/drivers/virt-pci.c index d762d726b66cf..0666c9e0998d1 100644 --- a/arch/um/drivers/virt-pci.c +++ b/arch/um/drivers/virt-pci.c @@ -641,7 +641,7 @@ static void um_pci_virtio_remove(struct virtio_device *vdev) } /* Stop all virtqueues */ - virtio_reset_device(vdev); + vdev->config->reset(vdev); dev->cmd_vq = NULL; dev->irq_vq = NULL; vdev->config->del_vqs(vdev); -- 2.53.0