| Message ID | 20240429131245.5d4fcc37@canb.auug.org.au (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | linux-next: manual merge of the drm-xe tree with the drm tree | expand |
diff --cc drivers/gpu/drm/xe/compat-i915-headers/i915_drv.h index ffaa4d2f1eed,9ee694bf331f..000000000000 --- a/drivers/gpu/drm/xe/compat-i915-headers/i915_drv.h
Hi all, Today's linux-next merge of the drm-xe tree got a conflict in: drivers/gpu/drm/xe/compat-i915-headers/i915_drv.h between commit: cb4046d289bd ("drm/i915: Drop dead code for xehpsdv") from the drm tree and commit: 6a2a90cba12b ("drm/xe/display: Fix ADL-N detection") from the drm-xe 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.