Hi all,
On Thu, 4 Feb 2021 15:58:46 +1100 Stephen Rothwell sfr@canb.auug.org.au wrote:
Today's linux-next merge of the drivers-x86 tree got a conflict in:
drivers/gpu/drm/gma500/Kconfig drivers/gpu/drm/gma500/mdfld_device.c drivers/gpu/drm/gma500/mdfld_dsi_output.c drivers/gpu/drm/gma500/mdfld_output.c drivers/gpu/drm/gma500/tc35876x-dsi-lvds.c
between commits:
b51035c200bd ("drm/gma500: Remove Medfield support")
Now
e1da811218d2 ("drm/gma500: Remove Medfield support")
837f23bb4b60 ("drm/gma500: Drop DRM_GMA3600 config option")
Now
26499e0518a7 ("drm/gma500: Drop DRM_GMA3600 config option")
from the drm-misc tree and commit:
bfc838f8598e ("drm/gma500: Convert to use new SCU IPC API") 25ded39ad064 ("drm/gma500: Get rid of duplicate NULL checks")
from the drivers-x86 tree.
I fixed it up (the former removed the text that was updated by the latter and removed the last 4 files) 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.
With the merge window about to open, this is a reminder that this conflict still exists.
The two drivers-x86 tree commits have also been merged into the pm tree.