From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 BC5073033D5; Sun, 1 Mar 2026 02:05:09 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772330709; cv=none; b=LC62f8WzywX3napz6vrluPHNrcz4s+WWA+R1benfRLpj2qVAJEW9/DMgodCldjriyo0MD1GPoIgS2khZzMvRXq7DvwbDOx/BgJDcf1uJCpxQTli2JgJdltBzkEHHYePHzowVv8Yw76jCl+huOrk0cgwBM4on+ie94XraOy0Iwyg= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772330709; c=relaxed/simple; bh=48spGrgVqcI8zWtm6MgnDf2HL5282UVUNksVg/2L6uU=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=oFtd9DkrMCiR3WQoynzJbiJsAO/ADQulGj+GphYVxGV7TeqGjd2siE4PZvzeIJUvRkAi5JMtL6JW7K7SWdA8AgjjAnt2lLjFi2ZZ7NQPGEB0Vim+9Ohfpo7OqNwoGN9aurIBQ1OEOY1vkyOrRkx1lRFundGOD2emZKxtFp+JW7M= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=VHiXJ8dM; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="VHiXJ8dM" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2983DC19421; Sun, 1 Mar 2026 02:05:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1772330709; bh=48spGrgVqcI8zWtm6MgnDf2HL5282UVUNksVg/2L6uU=; h=From:To:Cc:Subject:Date:From; b=VHiXJ8dMIpQpvRHJcF6x1zwImyQ0G2pH16vrqhfZ75Jbo84k6sbwhwULGAm4EF9dp cFcPpailx/Gi4+gR2Cb7jt6ck1MPnFCsTTnLg3yzh4aN2x2dlnFBhE041X3i4Nh9OW xmp7eY7Y6rvuxHUAbhj77UQz5T+rDozbPwUH/w6nGKJ51lQkCmuKbiQRdoNxQJ5WA2 ZhU0wBuwL9HAMB6Ul4QF4LS4d4xTtuu8oxdWS8k3D99c4RZqdAnDiAy14WWHi1258i KRZkDIHEeWIwEVPHUjEi03HtIXe/BEnOYVwuirD6rLCLgB9hFwx1Wd/U5kow8FGWa2 //VOtR4eyihDw== From: Sasha Levin To: stable@vger.kernel.org, enelsonmoore@gmail.com Cc: Paolo Abeni , netdev@vger.kernel.org Subject: FAILED: Patch "net: ethernet: marvell: skge: remove incorrect conflicting PCI ID" failed to apply to 5.10-stable tree Date: Sat, 28 Feb 2026 21:05:07 -0500 Message-ID: <20260301020508.1733763-1-sashal@kernel.org> X-Mailer: git-send-email 2.51.0 Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Patchwork-Hint: ignore X-stable: review Content-Transfer-Encoding: 8bit The patch below does not apply to the 5.10-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to . Thanks, Sasha ------------------ original commit in Linus's tree ------------------ >From d01103fdcb871fd83fd06ef5803d576507c6a801 Mon Sep 17 00:00:00 2001 From: Ethan Nelson-Moore Date: Thu, 5 Feb 2026 23:17:14 -0800 Subject: [PATCH] net: ethernet: marvell: skge: remove incorrect conflicting PCI ID The ID 1186:4302 is matched by both r8169 and skge. The same device ID should not be in more than one driver, because in that case, which driver is used is unpredictable. I downloaded the latest drivers for all hardware revisions of the D-Link DGE-530T from D-Link's website, and the only drivers which contain this ID are Realtek drivers. Therefore, remove this device ID from skge. In the kernel bug report which requested addition of this device ID, someone created a patch to add the ID to skge. Then, it was pointed out that this device is an "r8169 in disguise", and a patch was created to add it to r8169. Somehow, both of these patches got merged. See the link below. Link: https://bugzilla.kernel.org/show_bug.cgi?id=38862 Fixes: c074304c2bcf ("add pci-id for DGE-530T") Cc: stable@vger.kernel.org Signed-off-by: Ethan Nelson-Moore Link: https://patch.msgid.link/20260206071724.15268-1-enelsonmoore@gmail.com Signed-off-by: Paolo Abeni --- drivers/net/ethernet/marvell/skge.c | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/net/ethernet/marvell/skge.c b/drivers/net/ethernet/marvell/skge.c index 05349a0b2db1c..cf4e26d337bb5 100644 --- a/drivers/net/ethernet/marvell/skge.c +++ b/drivers/net/ethernet/marvell/skge.c @@ -78,7 +78,6 @@ static const struct pci_device_id skge_id_table[] = { { PCI_DEVICE(PCI_VENDOR_ID_SYSKONNECT, 0x4320) }, /* SK-98xx V2.0 */ { PCI_DEVICE(PCI_VENDOR_ID_DLINK, 0x4b01) }, /* D-Link DGE-530T (rev.B) */ { PCI_DEVICE(PCI_VENDOR_ID_DLINK, 0x4c00) }, /* D-Link DGE-530T */ - { PCI_DEVICE(PCI_VENDOR_ID_DLINK, 0x4302) }, /* D-Link DGE-530T Rev C1 */ { PCI_DEVICE(PCI_VENDOR_ID_MARVELL, 0x4320) }, /* Marvell Yukon 88E8001/8003/8010 */ { PCI_DEVICE(PCI_VENDOR_ID_MARVELL, 0x5005) }, /* Belkin */ { PCI_DEVICE(PCI_VENDOR_ID_CNET, 0x434E) }, /* CNet PowerG-2000 */ -- 2.51.0