On Thursday, February 4, 2021, Stephen Rothwell sfr@canb.auug.org.au wrote:
Hi all,
Today's linux-next merge of the drivers-x86 tree got a conflict in:
Thanks. I already asked Patrick yesterday day if DRM missed to pull an immutable tag I provided. I think they can pull and resolve conflicts themselves. Alternatively it would be easy to resolve by Linus by removing Kconfig lines along with mentioned files,
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") 837f23bb4b60 ("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.
-- Cheers, Stephen Rothwell