Hi all, Today's linux-next merge of the drm-intel tree got a conflict in:
drivers/gpu/drm/i915/intel_pm.c between commit: 344df9809f45 ("drm/i915/skl: Disable coarse power gating up until F0") from Linus' tree and commit: 06e668ac91c9 ("drm/i915: Apply broader WaRsDisableCoarsePowerGating for guc also") from the drm-intel tree. I fixed it up (I just used the latter version) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwell s...@canb.auug.org.au -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/