Messages in this thread | | | From | Jani Nikula <> | Subject | Re: linux-next: manual merge of the drm-intel tree with the drm-intel-fixes tree | Date | Thu, 24 Sep 2015 11:57:05 +0300 |
| |
On Thu, 24 Sep 2015, 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/intel_display.c > > 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.
Thanks, Jani.
-- Jani Nikula, Intel Open Source Technology Center
| |