Messages in this thread | | | Date | Tue, 22 Dec 2015 12:03:58 +1100 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the drm-intel tree with Linus' tree |
| |
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 sfr@canb.auug.org.au
| |