[Intel-gfx] [PATCH 08/12] drm/i915: Rename backpointer from intel_ringbuffer to intel_engine_cs

[Chris Wilson]

On Tue, Nov 24, 2015 at 03:58:13PM +0100, Daniel Vetter wrote:
> On Fri, Nov 20, 2015 at 12:43:48PM +0000, Chris Wilson wrote:
> > Having ringbuf->ring point to an engine is confusing, so rename it once
> > again to ring->engine.
> > 
> > Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
> 
> This massively conflicts with
> 
> commit e84fe80337dc85cca07d0417ea97edbec4789d8b
> Author: Nick Hoath <nicholas.hoath at intel.com>
> Date:   Fri Sep 11 12:53:46 2015 +0100
> 
>     drm/i915: Split alloc from init for lrc
> 
> since this patch touches piles of old code now removed. But no functional
> conflict afaics, so Acked-by: Daniel Vetter <daniel.vetter at ffwll.ch>
> 
> Maybe rebase before sending ;-)

Depends on how much you value testing.
-Chris

-- 
Chris Wilson, Intel Open Source Technology Centre