Messages in this thread | | | Date | Fri, 26 Jul 2013 13:14:27 +1000 | 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_pm.c between commit 14c5cec5d0cd ("drm/i915: initialize gt_lock early with other spin locks") from the drm-intel-fixes tree and commit 907b28c56ea4 ("drm/i915: Colocate all GT access routines in the same file") from the drm-intel tree.
I fixed it up (using the drm-intel tree version) 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] | |