| Message ID | 20230411135909.140d2560@canb.auug.org.au (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | linux-next: manual merge of the tip tree with the drm tree | expand |
diff --cc drivers/gpu/drm/i915/gt/intel_rc6.c index 8f3cd68d14f8,3d6109f1d05c..000000000000 --- a/drivers/gpu/drm/i915/gt/intel_rc6.c
Hi all, Today's linux-next merge of the tip tree got a conflict in: drivers/gpu/drm/i915/gt/intel_rc6.c between commit: 3735040978a4 ("drm/i915/mtl: Synchronize i915/BIOS on C6 enabling") from the drm tree and commit: f7faedffa92c ("drm/i915/gt: use __xchg instead of internal helper") from the tip 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.