| Message ID | 20220405105319.2eb47e9d@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/i915_pci.c index c32c0c6661c8,8e321d300e0c..000000000000 --- a/drivers/gpu/drm/i915/i915_pci.c
Hi all, Today's linux-next merge of the drm-intel tree got a conflict in: drivers/gpu/drm/i915/i915_pci.c between commit: 132aaaf01788 ("drm/i915: add needs_compact_pt flag") from Linus' tree and commits: 072ce4164f97 ("drm/i915/dg2: Tile 4 plane format support") 412c942bdfae ("drm/i915/ats-m: add ATS-M platform info") from the drm-intel tree. I fixed it up (I think, 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.