| Message ID | 20221117131313.22294c0c@canb.auug.org.au (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | linux-next: manual merge of the drm tree with Linus' tree | expand |
diff --cc drivers/gpu/drm/rcar-du/Kconfig index fd2c2eaee26b,f14686549cbe..000000000000 --- a/drivers/gpu/drm/rcar-du/Kconfig
Hi all, Today's linux-next merge of the drm tree got a conflict in: drivers/gpu/drm/rcar-du/Kconfig between commit: a830a1567859 ("drm: rcar-du: Fix Kconfig dependency between RCAR_DU and RCAR_MIPI_DSI") from Linus' tree and commit: 7a043f978ed1 ("drm: rcar-du: Add RZ/G2L DSI driver") from the drm 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.