From 96a211bca8bcc72de621f8990d476177d3463857 Mon Sep 17 00:00:00 2001
From: Aleksandr Nogikh <nogikh@google.com>
Date: Mon, 1 Sep 2025 14:56:33 +0200
Subject: pkg/vcs: backport fixes for devm_drm_of_get_bridge link error

This should fix our broken bisections.

Closes #6136.
---
 pkg/vcs/linux_patches.go | 12 ++++++++++++
 1 file changed, 12 insertions(+)

(limited to 'pkg/vcs')

diff --git a/pkg/vcs/linux_patches.go b/pkg/vcs/linux_patches.go
index 85d74c620..c95e77599 100644
--- a/pkg/vcs/linux_patches.go
+++ b/pkg/vcs/linux_patches.go
@@ -114,4 +114,16 @@ var pickLinuxCommits = []BackportCommit{
 		FixHash:    `10a77965760c6e2b3eef483be33ae407004df894`,
 		FixTitle:   `batman-adv: Fix double-hold of meshif when getting enabled`,
 	},
+	{
+		// Fixes `ld.lld: error: undefined symbol: devm_drm_of_get_bridge`.
+		GuiltyHash: `2a04739139b2b2761571e18937e2400e71eff664`,
+		FixHash:    `b12fa5e76e1463fc5a196f2717040e4564e184b6`,
+		FixTitle:   `drm/bridge: select DRM_KMS_HELPER for AUX_BRIDGE`,
+	},
+	{
+		// Fixes `undefined symbol: devm_drm_of_get_bridge referenced by nb7vpq904m.c`.
+		GuiltyHash: `2a04739139b2b2761571e18937e2400e71eff664`,
+		FixHash:    `c5d296bad640b190c52ef7508114d70e971a4bba`,
+		FixTitle:   `usb: typec: nb7vpq904m: switch to DRM_AUX_BRIDGE`,
+	},
 }
-- 
cgit mrf-deployment