Re: linux-next: manual merge of the drm-intel tree with the drm-intel-fixes tree
From: Jani Nikula
Date: Thu Sep 24 2015 - 04:57:45 EST
On Thu, 24 Sep 2015, Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
> Hi all,
> Today's linux-next merge of the drm-intel tree got a conflict in:
> between commit:
> 721a09f7393d ("drm/i915: Add primary plane to mask if it's visible")
> from the drm-intel-fixes tree and commit:
> f9cd7b881a04 ("drm/i915: Move sprite/cursor plane disable to intel_sanitize_crtc()")
> from the drm-intel tree.
> I fixed it up (I have no idea what do to here, so I just used the version
> from the drm-intel tree) and can carry the fix as necessary (no action
> is required - unless there is a better fix).
That was the right thing to do.
The former commit is headed for v4.3, and there will have to be another
version of it for -next. This will cause you another conflict, and you
should resolve it with the same approach.
Jani Nikula, Intel Open Source Technology Center
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/