Hi all, Today's linux-next merge of the drm-intel tree got a conflict in: drivers/gpu/drm/i915/intel_fbc.c between commit: 1e3fa0acfec6 ("drm/i915/fbc: Disable on HSW by default for now") from the drm-intel-fixes tree and commit: 80788a0fbbdf ("drm/i915/fbc: sanitize i915.enable_fbc during FBC init") from the drm-intel tree. I fixed it up (since the former patch appears on both trees, I just used the latter) 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 _______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/intel-gfx