Messages in this thread | | | Date | Fri, 9 Jan 2015 13:06:50 +1100 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the drm-intel tree with the drm-intel-fixes tree |
| |
Hi all,
Today's linux-next merge of the drm-intel tree got a conflict in drivers/gpu/drm/i915/intel_runtime_pm.c between commit 7f1241ed1a06 ("drm/i915: Kill check_power_well() calls") from the drm-intel-fixes tree and commit e2c719b75c8c ("drm/i915: tame the chattermouth (v2)") from the drm-intel tree.
I fixed it up (the former removed the code modified by the latter) 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] | |