| Message ID | 20240109112254.405d3a1a@canb.auug.org.au (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | linux-next: manual merge of the drm-intel tree with Linus' tree | expand |
diff --cc drivers/gpu/drm/i915/display/intel_dp.c index 7d2b8ce48fda,93f9985ef75c..000000000000 --- a/drivers/gpu/drm/i915/display/intel_dp.c
Hi all, Today's linux-next merge of the drm-intel tree got a conflict in: drivers/gpu/drm/i915/display/intel_dp.c between commit: fc93835bb0d7 ("drm: Add HPD state to drm_connector_oob_hotplug_event()") from Linus' tree and commit: cd572b3bb27e ("drm/i915: Disable hotplug detection works during driver init/shutdown") from the drm-intel tree. I fixed it up (maybe, 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.