| Message ID | 20211124110957.18dea3f2@canb.auug.org.au (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | linux-next: manual merge of the drm-intel-gt tree with the drm-intel tree | expand |
diff --cc drivers/gpu/drm/i915/i915_pci.c index 69b8029da6b6,5e6795853dc3..000000000000 --- a/drivers/gpu/drm/i915/i915_pci.c
Hi all, Today's linux-next merge of the drm-intel-gt tree got a conflict in: drivers/gpu/drm/i915/i915_pci.c between commit: 3c542cfa8266 ("drm/i915/dg2: Tile 4 plane format support") from the drm-intel tree and commit: a5b7ef27da60 ("drm/i915: Add struct to hold IP version") from the drm-intel-gt 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.