| Message ID | 20220629110628.71bef7c7@canb.auug.org.au (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | linux-next: manual merge of the drm-misc tree with Linus' tree | expand |
diff --cc drivers/gpu/drm/vc4/vc4_drv.c index 0f0f0263e744,14a7d529144d..000000000000 --- a/drivers/gpu/drm/vc4/vc4_drv.c
Hi all, Today's linux-next merge of the drm-misc tree got a conflict in: drivers/gpu/drm/vc4/vc4_drv.c between commit: 538f11116061 ("drm/vc4: drv: Register a different driver on BCM2711") from Linus' tree and commit: da8e393e23ef ("drm/vc4: drv: Adopt the dma configuration from the HVS or V3D component") from the drm-misc 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.