| Message ID | 20250114123028.67761865@canb.auug.org.au (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | linux-next: manual merge of the drm tree with the drm-misc-fixes tree | expand |
diff --cc drivers/gpu/drm/display/drm_bridge_connector.c index 3a5a4f92c979,32108307de66..000000000000 --- a/drivers/gpu/drm/display/drm_bridge_connector.c
Hi all, Today's linux-next merge of the drm tree got a conflict in: drivers/gpu/drm/display/drm_bridge_connector.c between commit: 1bd1562d3522 ("drm/bridge-connector: Sync supported_formats with computed ycbcr_420_allowed") from the drm-misc-fixes tree and commit: 0beba3f9d366 ("drm/bridge: connector: add support for HDMI codec framework") from the drm tree. I fixed it up (see below) and can carry the fix as necessary. This is now fixed as far as linux-next is concerned, but any non trivial conflicts should be mentioned to your upstream maintainer when your tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts.