On Wed, Jan 22, 2014 at 2:06 AM, Daniel Vetter daniel.vetter@ffwll.ch wrote:
Hi Stephen,
On Wed, Jan 22, 2014 at 4:04 AM, Stephen Rothwell sfr@canb.auug.org.au wrote:
Hi all,
Today's linux-next merge of the drm-intel tree got a conflict in drivers/gpu/drm/i915/i915_irq.c between commit abca9e454498 ("drm: Pass 'flags' from the caller to .get_scanout_position()") from the drm tree and commit d59a63ad8234 ("drm/i915: Add intel_get_crtc_scanline()") from the drm-intel tree.
I fixed it up (I think - see below) and can carry the fix as necessary (no action is required).
Oops, this patch escaped - it's only for 3.15. I've shuffled my branches around now for the merge window so this should not pop up in your -next tree again until 3.15 starts.
I just bisected boot failures on x86 chromebooks with -next to this merge commit. I'll take a look tomorrow morning and make sure they're gone.
-Olof