Messages in this thread | | | Date | Wed, 29 Apr 2015 11:15:11 +1000 | 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/i915_drv.c between commit 5df0582bf036 ("drm/i915/vlv: remove wait for previous GFX clk disable request") from Linus' tree and commit 85250ddff7a6 ("drm/i915/chv: Remove Wait for a previous gfx force-off") from the drm-intel tree (which also appeared as commit c9c52e24194a in Linus' tree before v4.0).
I fixed it up (I used the version from Linus' tree) and can carry the fix as necessary (no action is required).
-- Cheers, Stephen Rothwell sfr@canb.auug.org.au [unhandled content-type:application/pgp-signature] | |