[Intel-gfx] linux-next: manual merge of the drm tree with the drm-intel-fixes tree

[Xi Ruoyao]

On 03/16/2015 at 10:30 AM, Stephen Rothwell wrote:
> Hi Dave,
>
> Today's linux-next merge of the drm tree got a conflict in
> drivers/gpu/drm/i915/intel_display.c between commit 2dccc9898d45
> ("drm/i915: Ensure plane->state->fb stays in sync with plane->fb") from
> the drm-intel-fixes tree and commit afd65eb4cc05 ("drm/i915: Ensure
> plane->state->fb stays in sync with plane->fb"), f55548b5af87
> ("drm/i915: Don't try to reference the fb in
> get_initial_plane_config()") and presumably others from the drm tree.
>
> Same patch summary, different authors, committers and added function.
>
> I fixed it up (I effectively used the drm tree version) and can carry
> the fix as necessary (no action is required).
>
My patch with commit 2dccc9898d45 is for Linux 4.0-rcN. It has no 
relationship
  with linux-next since Matt Roper's afd65eb4cc05 has solved this long 
long ago.

So, 2dccc9898d45 should not be tagged with for-linux-next-fixes (in 
repository
http://cgit.freedesktop.org/drm-intel/). I think it caused the mess of 
version
control.

BTW, there is still one thing should be done in linux-next. We should 
change
Matt's update_state_fb to use drm_atomic_set_fb_for_plane since the logic of
Matt's code is duplicated with drm_atomic_set_fb_for_plane.

-- 
Xi Ruoyao
School of Aerospace Science and Technology
Xidian University, Xi'an, China