| Message ID | 20241018125649.4475512d@canb.auug.org.au (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | linux-next: manual merge of the drm tree with the drm-fixes tree | expand |
diff --cc drivers/gpu/drm/i915/display/intel_dp_mst.c index eeaedd979354,4765bda154c1..000000000000 --- a/drivers/gpu/drm/i915/display/intel_dp_mst.c
Hi all, Today's linux-next merge of the drm tree got a conflict in: drivers/gpu/drm/i915/display/intel_dp_mst.c between commit: 69b3d8721267 ("drm/i915/dp_mst: Handle error during DSC BW overhead/slice calculation") from the drm-fixes tree and commit: f2e2092a979c ("drm/i915/display: Use joined pipes in dsc helpers for slices, bpp") 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.