Messages in this thread | | | Date | Fri, 13 Apr 2012 13:38:17 +1000 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the drm tree with Linus' tree |
| |
Hi Dave,
Today's linux-next merge of the drm tree got a conflict in drivers/gpu/drm/i915/intel_i2c.c between commit 6a562e3daee2 ("Revert "drm/i915: reenable gmbus on gen3+ again"") from Linus' tree and commits 0fb3f969c868 ("drm/i915: enable gmbus on gen2") and 2ed06c93a1fc ("drm/i915/intel_i2c: gmbus disabled and reserved ports are invalid") from the drm tree.
I just used the drm tree version. -- Cheers, Stephen Rothwell sfr@canb.auug.org.au [unhandled content-type:application/pgp-signature] | |