| Message ID | 20230125104248.1e9775ca@canb.auug.org.au (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | linux-next: manual merge of the drm-intel tree with the drm tree | expand |
diff --cc drivers/gpu/drm/i915/i915_drv.h index 48fd82722f12,ac4c3c6f5541..000000000000 --- a/drivers/gpu/drm/i915/i915_drv.h
Hi all, Today's linux-next merge of the drm-intel tree got a conflict in: drivers/gpu/drm/i915/i915_drv.h between commit: f67986b0119c ("drm/i915/pxp: Promote pxp subsystem to top-level of i915") from the drm tree and commit: a3f839762ceb ("drm/i915: move pch_ssc_use to display sub-struct under dpll") from the drm-intel 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.